generator-code 1.6.7 → 1.6.10

package/generators/app/dependencyVersions/package.json

@@ -0,0 +1,34 @@
+{
+    "name": "generator-code-dependencies-versions",
+    "description": "Helper file to manage the versions of the node modules used by the generators. Named package.json so the VS Code dependencies completions work. Must be in a subfolder due to #325",
+    "version": "0.0.0",
+    "private": true,
+    "dependencies": {
+        "@types/glob": "^7.2.0",
+        "@types/mocha": "^9.1.1",
+        "@types/node": "14.x",
+        "@typescript-eslint/eslint-plugin": "^5.21.0",
+        "@typescript-eslint/parser": "^5.21.0",
+        "eslint": "^8.14.0",
+        "glob": "^8.0.1",
+        "mocha": "^9.2.2",
+        "typescript": "^4.6.4",
+        "@vscode/test-electron": "^2.1.3",
+        "@vscode/test-web": "^0.0.24",
+        "@types/webpack-env": "^1.16.4",
+        "@types/vscode-notebook-renderer": "^1.60.0",
+        "concurrently": "^5.3.0",
+        "css-loader": "^4.2.0",
+        "fork-ts-checker-webpack-plugin": "^5.0.14",
+        "style-loader": "^1.2.1",
+        "ts-loader": "^9.2.8",
+        "vscode-dts": "^0.3.3",
+        "vscode-notebook-error-overlay": "^1.0.1",
+        "webpack": "^5.70.0",
+        "util": "^0.12.4",
+        "webpack-cli": "^4.9.2",
+        "webpack-dev-server": "^3.11.2",
+        "assert": "^2.0.0",
+        "process": "^0.11.10"
+    }
+}

package/generators/app/env.js

@@ -41,7 +41,7 @@ module.exports.getLatestVSCodeVersion = getLatestVSCodeVersion;
 
 module.exports.getDependencyVersions = async function () {
     const vscodeVersion = await getLatestVSCodeVersion();
-    const versions = JSON.parse((await fs.promises.readFile(path.join(__dirname, 'package.json'))).toString()).dependencies;
+    const versions = JSON.parse((await fs.promises.readFile(path.join(__dirname, 'dependencyVersions', 'package.json'))).toString()).dependencies;
     versions["@types/vscode"] = vscodeVersion
     return versions;
-}
+}

package/generators/app/generate-colortheme.js

@@ -48,8 +48,12 @@ module.exports = {
                 value: "vs"
             },
             {
-                name: "High Contrast",
+                name: "High Contrast Dark",
                 value: "hc-black"
+            },
+            {
+                name: "High Contrast Light",
+                value: "hc-light"
             }
             ]
         });
@@ -71,13 +75,7 @@ module.exports = {
             extensionConfig.themeContent.name = extensionConfig.themeName;
             generator.fs.copyTpl(generator.templatePath('themes/color-theme.json'), generator.destinationPath('themes', extensionConfig.themeFileName), extensionConfig);
         } else {
-            if (extensionConfig.themeBase === 'vs') {
-                generator.fs.copyTpl(generator.templatePath('themes/new-light-color-theme.json'), generator.destinationPath('themes', extensionConfig.themeFileName), extensionConfig);
-            } else if (extensionConfig.themeBase === 'hc') {
-                generator.fs.copyTpl(generator.templatePath('themes/new-hc-color-theme.json'), generator.destinationPath('themes', extensionConfig.themeFileName), extensionConfig);
-            } else {
-                generator.fs.copyTpl(generator.templatePath('themes/new-dark-color-theme.json'), generator.destinationPath('themes', extensionConfig.themeFileName), extensionConfig);
-            }
+            generator.fs.copyTpl(generator.templatePath('themes/new-' + extensionConfig.themeBase + '-color-theme.json'), generator.destinationPath('themes', extensionConfig.themeFileName), extensionConfig);
         }
 
         generator.fs.copy(generator.templatePath('vscode'), generator.destinationPath('.vscode'));
@@ -144,17 +142,20 @@ function convertTheme(location, extensionConfig, inline, generator) {
         // load from url
         return request.xhr({ url: location }).then(r => {
             if (r.status == 200) {
-                var tmThemeFileName = null;
+                let tmThemeFileName = null;
                 if (!inline) {
-                    var contentDisposition = r.headers && r.headers['content-disposition'];
-                    if (contentDisposition) {
-                        var fileNameMatch = contentDisposition.match(/filename="([^"]*)/);
+                    let contentDisposition = r.headers && r.headers['content-disposition'];
+                    if (Array.isArray(contentDisposition)) {
+                        contentDisposition = contentDisposition[0];
+                    }
+                    if (typeof contentDisposition === 'string') {
+                        const fileNameMatch = contentDisposition.match(/filename="([^"]*)/);
                         if (fileNameMatch) {
                             tmThemeFileName = fileNameMatch[1];
                         }
                     }
                     if (!tmThemeFileName) {
-                        var lastSlash = location.lastIndexOf('/');
+                        const lastSlash = location.lastIndexOf('/');
                         if (lastSlash) {
                             tmThemeFileName = location.substr(lastSlash + 1);
                         } else {
@@ -169,14 +170,14 @@ function convertTheme(location, extensionConfig, inline, generator) {
         });
     } else {
         // load from disk
-        var body = null;
+        let body = null;
         try {
             body = fs.readFileSync(location);
         } catch (error) {
             return Promise.reject("Problems loading theme: " + error.message);
         }
         if (body) {
-            var fileName = null;
+            let fileName = null;
             if (!inline) {
                 fileName = path.basename(location);
             }
@@ -188,8 +189,8 @@ function convertTheme(location, extensionConfig, inline, generator) {
 }
 
 function processContent(extensionConfig, tmThemeFileName, body, generator) {
-    var themeNameMatch = body.match(/<key>name<\/key>\s*<string>([^<]*)/);
-    var themeName = themeNameMatch ? themeNameMatch[1] : '';
+    const themeNameMatch = body.match(/<key>name<\/key>\s*<string>([^<]*)/);
+    const themeName = themeNameMatch ? themeNameMatch[1] : '';
     try {
         extensionConfig.themeContent = migrate(body, tmThemeFileName, generator);
         if (tmThemeFileName) {
@@ -209,7 +210,7 @@ function processContent(extensionConfig, tmThemeFileName, body, generator) {
 };
 
 // mapping from old tmTheme setting to new workbench color ids
-var mappings = {
+const mappings = {
     "background": ["editor.background"],
     "foreground": ["editor.foreground"],
     "hoverHighlight": ["editor.hoverHighlightBackground"],
@@ -237,7 +238,7 @@ var mappings = {
 
 function migrate(content, tmThemeFileName, generator) {
     let result = {};
-    var theme;
+    let theme;
     try {
         theme = plistParser.parse(content);
     } catch (e) {
@@ -254,7 +255,7 @@ function migrate(content, tmThemeFileName, generator) {
                     entry.scope = parts;
                 }
             } else {
-                var entrySettings = entry.settings;
+                const entrySettings = entry.settings;
                 let notSupported = [];
                 for (let entry in entrySettings) {
                     let mapping = mappings[entry];
@@ -282,4 +283,4 @@ function migrate(content, tmThemeFileName, generator) {
         result.colors = colorMap;
     }
     return result;
-};
+};

package/generators/app/index.js

@@ -8,7 +8,7 @@ const yosay = require('yosay');
 
 const path = require('path');
 const env = require('./env');
-const witch = require('which');
+const which = require('which');
 
 const colortheme = require('./generate-colortheme');
 const commandjs = require('./generate-command-js');
@@ -185,7 +185,7 @@ module.exports = class extends Generator {
 
         // Git init
         if (this.extensionConfig.gitInit) {
-            this.spawnCommand('git', ['init', '--quiet']);
+            this.spawnCommand('git', ['init', '--quiet', '--initial-branch=main']);
         }
 
         if (this.extensionConfig.proposedAPI) {
@@ -196,7 +196,7 @@ module.exports = class extends Generator {
         this.log('Your extension ' + this.extensionConfig.name + ' has been created!');
         this.log('');
 
-        const [codeStableLocation, codeInsidersLocation] = await Promise.all([witch('code').catch(() => undefined), witch('code-insiders').catch(() => undefined)]);
+        const [codeStableLocation, codeInsidersLocation] = await Promise.all([which('code').catch(() => undefined), which('code-insiders').catch(() => undefined)]);
 
         if (!this.extensionConfig.insiders && !this.options['open'] && !this.options['openInInsiders'] && !this.options['quick']) {
             const cdLocation = this.options['destination'] || this.extensionConfig.name;

package/generators/app/templates/ext-colortheme/themes/{new-hc-color-theme.json → new-hc-black-color-theme.json}

@@ -1,6 +1,5 @@
 {
 	"name": <%-JSON.stringify(themeName)%>,
-	"type": "hc",
 	"colors": {
 		"editor.background": "#000000",
 		"editor.foreground": "#ffffff"
@@ -383,4 +382,4 @@
 			}
 		}
 	]
-}
+}

package/generators/app/templates/ext-colortheme/themes/{new-light-color-theme.json → new-hc-light-color-theme.json}

@@ -1,6 +1,5 @@
 {
 	"name": <%-JSON.stringify(themeName)%>,
-	"type": "light",
 	"colors": {
 		"editor.background": "#f5f5f5",
 		"editor.foreground": "#333333",

package/generators/app/templates/ext-colortheme/themes/new-vs-color-theme.json

@@ -0,0 +1,413 @@
+{
+	"name": <%-JSON.stringify(themeName)%>,
+	"colors": {
+		"editor.background": "#f5f5f5",
+		"editor.foreground": "#333333",
+        "list.activeSelectionIconForeground": "#fff"
+	},
+	"tokenColors": [
+		{
+			"name": "Comments",
+			"scope": [
+				"comment",
+				"punctuation.definition.comment"
+			],
+			"settings": {
+				"fontStyle": "italic",
+				"foreground": "#AAAAAA"
+			}
+		},
+		{
+			"name": "Comments: Preprocessor",
+			"scope": "comment.block.preprocessor",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#AAAAAA"
+			}
+		},
+		{
+			"name": "Comments: Documentation",
+			"scope": [
+				"comment.documentation",
+				"comment.block.documentation"
+			],
+			"settings": {
+				"foreground": "#448C27"
+			}
+		},
+		{
+			"name": "Invalid - Illegal",
+			"scope": "invalid.illegal",
+			"settings": {
+				"foreground": "#660000"
+			}
+		},
+		{
+			"name": "Operators",
+			"scope": "keyword.operator",
+			"settings": {
+				"foreground": "#777777"
+			}
+		},
+		{
+			"name": "Keywords",
+			"scope": [
+				"keyword",
+				"storage"
+			],
+			"settings": {
+				"foreground": "#4B83CD"
+			}
+		},
+		{
+			"name": "Types",
+			"scope": [
+				"storage.type",
+				"support.type"
+			],
+			"settings": {
+				"foreground": "#7A3E9D"
+			}
+		},
+		{
+			"name": "Language Constants",
+			"scope": [
+				"constant.language",
+				"support.constant",
+				"variable.language"
+			],
+			"settings": {
+				"foreground": "#AB6526"
+			}
+		},
+		{
+			"name": "Variables",
+			"scope": [
+				"variable",
+				"support.variable"
+			],
+			"settings": {
+				"foreground": "#7A3E9D"
+			}
+		},
+		{
+			"name": "Functions",
+			"scope": [
+				"entity.name.function",
+				"support.function"
+			],
+			"settings": {
+				"fontStyle": "bold",
+				"foreground": "#AA3731"
+			}
+		},
+		{
+			"name": "Classes",
+			"scope": [
+				"entity.name.type",
+				"entity.other.inherited-class",
+				"support.class"
+			],
+			"settings": {
+				"fontStyle": "bold",
+				"foreground": "#7A3E9D"
+			}
+		},
+		{
+			"name": "Exceptions",
+			"scope": "entity.name.exception",
+			"settings": {
+				"foreground": "#660000"
+			}
+		},
+		{
+			"name": "Sections",
+			"scope": "entity.name.section",
+			"settings": {
+				"fontStyle": "bold"
+			}
+		},
+		{
+			"name": "Numbers, Characters",
+			"scope": [
+				"constant.numeric",
+				"constant.character",
+				"constant"
+			],
+			"settings": {
+				"foreground": "#AB6526"
+			}
+		},
+		{
+			"name": "Strings",
+			"scope": "string",
+			"settings": {
+				"foreground": "#448C27"
+			}
+		},
+		{
+			"name": "Strings: Escape Sequences",
+			"scope": "constant.character.escape",
+			"settings": {
+				"foreground": "#777777"
+			}
+		},
+		{
+			"name": "Strings: Regular Expressions",
+			"scope": "string.regexp",
+			"settings": {
+				"foreground": "#4B83CD"
+			}
+		},
+		{
+			"name": "Strings: Symbols",
+			"scope": "constant.other.symbol",
+			"settings": {
+				"foreground": "#AB6526"
+			}
+		},
+		{
+			"name": "Punctuation",
+			"scope": "punctuation",
+			"settings": {
+				"foreground": "#777777"
+			}
+		},
+		{
+			"name": "HTML: Doctype Declaration",
+			"scope": [
+				"meta.tag.sgml.doctype",
+				"meta.tag.sgml.doctype string",
+				"meta.tag.sgml.doctype entity.name.tag",
+				"meta.tag.sgml punctuation.definition.tag.html"
+			],
+			"settings": {
+				"foreground": "#AAAAAA"
+			}
+		},
+		{
+			"name": "HTML: Tags",
+			"scope": [
+				"meta.tag",
+				"punctuation.definition.tag.html",
+				"punctuation.definition.tag.begin.html",
+				"punctuation.definition.tag.end.html"
+			],
+			"settings": {
+				"foreground": "#91B3E0"
+			}
+		},
+		{
+			"name": "HTML: Tag Names",
+			"scope": "entity.name.tag",
+			"settings": {
+				"foreground": "#4B83CD"
+			}
+		},
+		{
+			"name": "HTML: Attribute Names",
+			"scope": [
+				"meta.tag entity.other.attribute-name",
+				"entity.other.attribute-name.html"
+			],
+			"settings": {
+				"fontStyle": "italic",
+				"foreground": "#91B3E0"
+			}
+		},
+		{
+			"name": "HTML: Entities",
+			"scope": [
+				"constant.character.entity",
+				"punctuation.definition.entity"
+			],
+			"settings": {
+				"foreground": "#AB6526"
+			}
+		},
+		{
+			"name": "CSS: Selectors",
+			"scope": [
+				"meta.selector",
+				"meta.selector entity",
+				"meta.selector entity punctuation",
+				"entity.name.tag.css"
+			],
+			"settings": {
+				"foreground": "#7A3E9D"
+			}
+		},
+		{
+			"name": "CSS: Property Names",
+			"scope": [
+				"meta.property-name",
+				"support.type.property-name"
+			],
+			"settings": {
+				"foreground": "#AB6526"
+			}
+		},
+		{
+			"name": "CSS: Property Values",
+			"scope": [
+				"meta.property-value",
+				"meta.property-value constant.other",
+				"support.constant.property-value"
+			],
+			"settings": {
+				"foreground": "#448C27"
+			}
+		},
+		{
+			"name": "CSS: Important Keyword",
+			"scope": "keyword.other.important",
+			"settings": {
+				"fontStyle": "bold"
+			}
+		},
+		{
+			"name": "Markup: Changed",
+			"scope": "markup.changed",
+			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"name": "Markup: Deletion",
+			"scope": "markup.deleted",
+			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"name": "Markup: Emphasis",
+			"scope": "markup.italic",
+			"settings": {
+				"fontStyle": "italic"
+			}
+		},
+		{
+			"name": "Markup: Error",
+			"scope": "markup.error",
+			"settings": {
+				"foreground": "#660000"
+			}
+		},
+		{
+			"name": "Markup: Insertion",
+			"scope": "markup.inserted",
+			"settings": {
+				"foreground": "#000000"
+			}
+		},
+		{
+			"name": "Markup: Link",
+			"scope": "meta.link",
+			"settings": {
+				"foreground": "#4B83CD"
+			}
+		},
+		{
+			"name": "Markup: Output",
+			"scope": [
+				"markup.output",
+				"markup.raw"
+			],
+			"settings": {
+				"foreground": "#777777"
+			}
+		},
+		{
+			"name": "Markup: Prompt",
+			"scope": "markup.prompt",
+			"settings": {
+				"foreground": "#777777"
+			}
+		},
+		{
+			"name": "Markup: Heading",
+			"scope": "markup.heading",
+			"settings": {
+				"foreground": "#AA3731"
+			}
+		},
+		{
+			"name": "Markup: Strong",
+			"scope": "markup.bold",
+			"settings": {
+				"fontStyle": "bold"
+			}
+		},
+		{
+			"name": "Markup: Traceback",
+			"scope": "markup.traceback",
+			"settings": {
+				"foreground": "#660000"
+			}
+		},
+		{
+			"name": "Markup: Underline",
+			"scope": "markup.underline",
+			"settings": {
+				"fontStyle": "underline"
+			}
+		},
+		{
+			"name": "Markup Quote",
+			"scope": "markup.quote",
+			"settings": {
+				"foreground": "#7A3E9D"
+			}
+		},
+		{
+			"name": "Markup Lists",
+			"scope": "markup.list",
+			"settings": {
+				"foreground": "#4B83CD"
+			}
+		},
+		{
+			"name": "Markup Styling",
+			"scope": [
+				"markup.bold",
+				"markup.italic"
+			],
+			"settings": {
+				"foreground": "#448C27"
+			}
+		},
+		{
+			"name": "Markup Inline",
+			"scope": "markup.inline.raw",
+			"settings": {
+				"fontStyle": "",
+				"foreground": "#AB6526"
+			}
+		},
+		{
+			"name": "Extra: Diff Range",
+			"scope": [
+				"meta.diff.range",
+				"meta.diff.index",
+				"meta.separator"
+			],
+			"settings": {
+				"foreground": "#434343"
+			}
+		},
+		{
+			"name": "Extra: Diff From",
+			"scope": "meta.diff.header.from-file",
+			"settings": {
+				"foreground": "#434343"
+			}
+		},
+		{
+			"name": "Extra: Diff To",
+			"scope": "meta.diff.header.to-file",
+			"settings": {
+				"foreground": "#434343"
+			}
+		}
+	]
+}

package/generators/app/templates/ext-colortheme/themes/{new-dark-color-theme.json → new-vs-dark-color-theme.json}

@@ -1,6 +1,5 @@
 {
 	"name": <%-JSON.stringify(themeName)%>,
-	"type": "dark",
 	"colors": {
 		"editor.background": "#263238",
 		"editor.foreground": "#eeffff",

package/generators/app/templates/ext-command-web/tsconfig.json

@@ -1,10 +1,10 @@
 {
 	"compilerOptions": {
 		"module": "commonjs",
-		"target": "es6",
+		"target": "ES2020",
 		"outDir": "dist",
 		"lib": [
-			"es6", "WebWorker"
+			"ES2020", "WebWorker"
 		],
 		"sourceMap": true,
 		"rootDir": "src",

package/generators/app/templates/ext-localization/vsc-extension-quickstart.md

@@ -20,7 +20,7 @@ To create/update the `translations` folder with the latest strings from transife
 
 * Get an API token from https://www.transifex.com/user/settings/api. The token needs to have access to the `vscode-editor`, `vscode-workbench` and `vscode-extensions` projects.
 * Set the API token to the environment variable `TRANSIFEX_API_TOKEN`.
-* Check out the `master` branch of the [VS Code repository](https://github.com/Microsoft/vscode).
+* Check out the `main` branch of the [VS Code repository](https://github.com/Microsoft/vscode).
   * Preferably, place the VSCode repo next to the language pack extension (so both have the same parent folder).
   * `cd vscode` and run `yarn` to initialize the VS Code repo. More information on how to build VS Code you can find [here](https://github.com/Microsoft/vscode/wiki/How-to-Contribute).
   * If the language pack extension is placed next to the VS Code repository: `npm run update-localization-extension <%- lpLanguageId %>`

package/generators/app/templates/ext-snippets/vsc-extension-quickstart.md

@@ -4,7 +4,7 @@
 
 * This folder contains all of the files necessary for your extension.
 * `package.json` - this is the manifest file that defines the location of the snippet file and specifies the language of the snippets.
-* `snippets/snippets.json` - the file containing all snippets.
+* `snippets/snippets.code-snippets` - the file containing all snippets.
 
 ## Get up and running straight away
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "generator-code",
-  "version": "1.6.7",
+  "version": "1.6.10",
   "description": "Yeoman generator for Visual Studio Code Extensions",
   "keywords": [
     "yeoman-generator",
@@ -36,19 +36,19 @@
   "dependencies": {
     "chalk": "^4.1.2",
     "fast-plist": "^0.1.2",
-    "request-light": "^0.5.7",
+    "request-light": "^0.5.8",
     "sanitize-filename": "^1.6.3",
     "which": "^2.0.2",
     "yeoman-generator": "^5.6.1",
     "yosay": "^2.0.2"
   },
   "devDependencies": {
-    "@types/mocha": "^9.1.0",
+    "@types/mocha": "^9.1.1",
     "@types/node": "^16.11.6",
-    "@types/yeoman-generator": "^5.2.8",
+    "@types/yeoman-generator": "^5.2.10",
     "@types/yeoman-test": "^4.0.3",
-    "mocha": "^9.2.0",
+    "mocha": "^9.2.2",
     "yeoman-environment": "^3.9.1",
-    "yeoman-test": "^6.2.0"
+    "yeoman-test": "^6.3.0"
   }
 }

package/generators/app/package.json

@@ -1,34 +0,0 @@
-{
-    "name": "yo-code-dependencies-versions",
-    "description": "Helper file to manage the versions of the node modules used by the generators.",
-    "version": "0.0.0",
-    "private": true,
-    "dependencies": {
-        "@types/glob": "^7.2.0",
-        "@types/mocha": "^9.0.0",
-        "@types/node": "14.x",
-        "@typescript-eslint/eslint-plugin": "^5.9.1",
-        "@typescript-eslint/parser": "^5.9.1",
-        "eslint": "^8.6.0",
-        "glob": "^7.2.0",
-        "mocha": "^9.1.3",
-        "typescript": "^4.5.4",
-        "@vscode/test-electron": "^2.0.3",
-        "@vscode/test-web": "^0.0.15",
-        "@types/webpack-env": "^1.16.3",
-        "@types/vscode-notebook-renderer": "^1.57.8",
-        "concurrently": "^5.3.0",
-        "css-loader": "^4.2.0",
-        "fork-ts-checker-webpack-plugin": "^5.0.14",
-        "style-loader": "^1.2.1",
-        "ts-loader": "^9.2.6",
-        "vscode-dts": "^0.3.3",
-        "vscode-notebook-error-overlay": "^1.0.1",
-        "webpack": "^5.66.0",
-        "util": "^0.12.4",
-        "webpack-cli": "^4.9.1",
-        "webpack-dev-server": "^3.11.2",
-        "assert": "^2.0.0",
-        "process": "^0.11.10"
-    }
-}