Use categories for builtin extensions groups (microsoft#202453)

sandy081 · web-flow · commit 1e0580ec231c · 2024-01-14T18:19:29.000+01:00
* support grouping of extensions

* remove grouping

* reuse categories parsing

* cleanup

* fix tests
diff --git a/extensions/bat/package.json b/extensions/bat/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin mmims/language-batchfile grammars/batchfile.cson ./syntaxes/batchfile.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/clojure/package.json b/extensions/clojure/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-clojure grammars/clojure.cson ./syntaxes/clojure.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/coffeescript/package.json b/extensions/coffeescript/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-coffee-script grammars/coffeescript.cson ./syntaxes/coffeescript.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/cpp/package.json b/extensions/cpp/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ./build/update-grammars.js"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/csharp/package.json b/extensions/csharp/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin dotnet/csharp-tmLanguage grammars/csharp.tmLanguage ./syntaxes/csharp.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
 	"configurationDefaults": {
 		"[csharp]": {
diff --git a/extensions/css/package.json b/extensions/css/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin microsoft/vscode-css grammars/css.cson ./syntaxes/css.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/dart/package.json b/extensions/dart/package.json
@@ -8,9 +8,12 @@
 	"engines": {
 		"vscode": "0.10.x"
 	},
-  "scripts": {
-    "update-grammar": "node ../node_modules/vscode-grammar-updater/bin dart-lang/dart-syntax-highlight grammars/dart.json ./syntaxes/dart.tmLanguage.json"
-  },
+	"scripts": {
+		"update-grammar": "node ../node_modules/vscode-grammar-updater/bin dart-lang/dart-syntax-highlight grammars/dart.json ./syntaxes/dart.tmLanguage.json"
+	},
+	"categories": [
+		"Programming Languages"
+	],
 	"contributes": {
 		"languages": [
 			{
@@ -26,9 +29,9 @@
 		],
 		"grammars": [
 			{
-					"language": "dart",
-					"scopeName": "source.dart",
-					"path": "./syntaxes/dart.tmLanguage.json"
+				"language": "dart",
+				"scopeName": "source.dart",
+				"path": "./syntaxes/dart.tmLanguage.json"
 			}
 		]
 	}
diff --git a/extensions/diff/package.json b/extensions/diff/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/diff.tmbundle Syntaxes/Diff.plist ./syntaxes/diff.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/docker/package.json b/extensions/docker/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin moby/moby contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage ./syntaxes/docker.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/fsharp/package.json b/extensions/fsharp/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin ionide/ionide-fsgrammar grammars/fsharp.json ./syntaxes/fsharp.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/go/package.json b/extensions/go/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin worlpaker/go-syntax syntaxes/go.tmLanguage.json ./syntaxes/go.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/groovy/package.json b/extensions/groovy/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/groovy.tmbundle Syntaxes/Groovy.tmLanguage ./syntaxes/groovy.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/handlebars/package.json b/extensions/handlebars/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin daaain/Handlebars grammars/Handlebars.json ./syntaxes/Handlebars.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "extensionKind": [
     "ui",
     "workspace"
diff --git a/extensions/hlsl/package.json b/extensions/hlsl/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin tgjones/shaders-tmLanguage grammars/hlsl.json ./syntaxes/hlsl.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/html/package.json b/extensions/html/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ./build/update-grammar.mjs"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/ini/package.json b/extensions/ini/package.json
@@ -12,6 +12,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/ini.tmbundle Syntaxes/Ini.plist ./syntaxes/ini.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/java/package.json b/extensions/java/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin redhat-developer/vscode-java language-support/java/java.tmLanguage.json ./syntaxes/java.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/javascript/package.json b/extensions/javascript/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "0.10.x"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "configurationDefaults": {
       "[javascript]": {
diff --git a/extensions/json/package.json b/extensions/json/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ./build/update-grammars.js"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/julia/package.json b/extensions/julia/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin JuliaEditorSupport/atom-language-julia grammars/julia_vscode.json ./syntaxes/julia.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
 	"contributes": {
 		"languages": [
 			{
diff --git a/extensions/latex/package.json b/extensions/latex/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ./build/update-grammars.js"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/less/package.json b/extensions/less/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ./build/update-grammar.js"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/log/package.json b/extensions/log/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin emilast/vscode-logfile-highlighter syntaxes/log.tmLanguage ./syntaxes/log.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/lua/package.json b/extensions/lua/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin sumneko/lua.tmbundle Syntaxes/Lua.plist ./syntaxes/lua.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/make/package.json b/extensions/make/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin fadeevab/make.tmbundle Syntaxes/Makefile.plist ./syntaxes/make.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/markdown-basics/package.json b/extensions/markdown-basics/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "^1.20.0"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/markdown-math/package.json b/extensions/markdown-math/package.json
@@ -11,7 +11,8 @@
     "vscode": "^1.54.0"
   },
   "categories": [
-    "Other"
+    "Other",
+    "Programming Languages"
   ],
   "capabilities": {
     "virtualWorkspaces": true,
diff --git a/extensions/objective-c/package.json b/extensions/objective-c/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ./build/update-grammars.js"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/perl/package.json b/extensions/perl/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/perl.tmbundle Syntaxes/Perl.plist ./syntaxes/perl.tmLanguage.json Syntaxes/Perl%206.tmLanguage ./syntaxes/perl6.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/php/package.json b/extensions/php/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "0.10.x"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/powershell/package.json b/extensions/powershell/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "*"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/pug/package.json b/extensions/pug/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin davidrios/pug-tmbundle Syntaxes/Pug.JSON-tmLanguage ./syntaxes/pug.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/python/package.json b/extensions/python/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "*"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/r/package.json b/extensions/r/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin REditorSupport/vscode-R syntax/r.json ./syntaxes/r.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/razor/package.json b/extensions/razor/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ./build/update-grammar.mjs"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/references-view/package.json b/extensions/references-view/package.json
@@ -22,9 +22,6 @@
   "bugs": {
     "url": "https://github.com/Microsoft/vscode-references-view/issues"
   },
-  "categories": [
-    "Programming Languages"
-  ],
   "activationEvents": [
     "onCommand:references-view.find",
     "onCommand:editor.action.showReferences"
diff --git a/extensions/restructuredtext/package.json b/extensions/restructuredtext/package.json
@@ -11,6 +11,7 @@
 	"scripts": {
 		"update-grammar": "node ../node_modules/vscode-grammar-updater/bin trond-snekvik/vscode-rst syntaxes/rst.tmLanguage.json ./syntaxes/rst.tmLanguage.json"
 	},
+	"categories": ["Programming Languages"],
 	"contributes": {
 		"languages": [
 			{
diff --git a/extensions/ruby/package.json b/extensions/ruby/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/ruby.tmbundle Syntaxes/Ruby.plist ./syntaxes/ruby.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/rust/package.json b/extensions/rust/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ./build/update-grammar.mjs"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/scss/package.json b/extensions/scss/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin atom/language-sass grammars/scss.cson ./syntaxes/scss.tmLanguage.json grammars/sassdoc.cson ./syntaxes/sassdoc.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/search-result/package.json b/extensions/search-result/package.json
@@ -9,9 +9,6 @@
   "engines": {
     "vscode": "^1.39.0"
   },
-  "categories": [
-    "Programming Languages"
-  ],
   "main": "./out/extension.js",
   "browser": "./dist/extension.js",
   "activationEvents": [
diff --git a/extensions/shaderlab/package.json b/extensions/shaderlab/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin tgjones/shaders-tmLanguage grammars/shaderlab.json ./syntaxes/shaderlab.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/shellscript/package.json b/extensions/shellscript/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin jeff-hykin/better-shell-syntax autogenerated/shell.tmLanguage.json ./syntaxes/shell-unix-bash.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/sql/package.json b/extensions/sql/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ./build/update-grammar.mjs"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/swift/package.json b/extensions/swift/package.json
@@ -11,6 +11,7 @@
   "scripts": {
     "update-grammar": "node ../node_modules/vscode-grammar-updater/bin jtbandes/swift-tmlanguage Swift.tmLanguage.json ./syntaxes/swift.tmLanguage.json"
   },
+  "categories": ["Programming Languages"],
   "contributes": {
     "languages": [
       {
diff --git a/extensions/theme-abyss/package.json b/extensions/theme-abyss/package.json
@@ -8,6 +8,7 @@
   "engines": {
     "vscode": "*"
   },
+  "categories": ["Themes"],
   "contributes": {
     "themes": [
       {
diff --git a/extensions/theme-kimbie-dark/package.json b/extensions/theme-kimbie-dark/package.json
diff --git a/extensions/theme-monokai-dimmed/package.json b/extensions/theme-monokai-dimmed/package.json
diff --git a/extensions/theme-monokai/package.json b/extensions/theme-monokai/package.json
diff --git a/extensions/theme-quietlight/package.json b/extensions/theme-quietlight/package.json
diff --git a/extensions/theme-red/package.json b/extensions/theme-red/package.json
diff --git a/extensions/theme-seti/package.json b/extensions/theme-seti/package.json
diff --git a/extensions/theme-solarized-dark/package.json b/extensions/theme-solarized-dark/package.json
diff --git a/extensions/theme-solarized-light/package.json b/extensions/theme-solarized-light/package.json
diff --git a/extensions/theme-tomorrow-night-blue/package.json b/extensions/theme-tomorrow-night-blue/package.json
diff --git a/extensions/typescript-basics/package.json b/extensions/typescript-basics/package.json
diff --git a/extensions/vb/package.json b/extensions/vb/package.json
diff --git a/extensions/xml/package.json b/extensions/xml/package.json
diff --git a/extensions/yaml/package.json b/extensions/yaml/package.json
diff --git a/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts b/src/vs/workbench/contrib/extensions/browser/extensions.contribution.ts
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViewlet.ts
diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
diff --git a/src/vs/workbench/contrib/extensions/common/extensionQuery.ts b/src/vs/workbench/contrib/extensions/common/extensionQuery.ts
diff --git a/src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts b/src/vs/workbench/contrib/extensions/test/common/extensionQuery.test.ts
diff --git a/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts b/src/vs/workbench/contrib/extensions/test/electron-sandbox/extensionsViews.test.ts

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`"scripts": {`
`12`	`12`	`"update-grammar": "node ../node_modules/vscode-grammar-updater/bin mmims/language-batchfile grammars/batchfile.cson ./syntaxes/batchfile.tmLanguage.json"`
`13`	`13`	`},`
	`14`	`+ "categories": ["Programming Languages"],`
`14`	`15`	`"contributes": {`
`15`	`16`	`"languages": [`
`16`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,12 @@`
`8`	`8`	`"engines": {`
`9`	`9`	`"vscode": "0.10.x"`
`10`	`10`	`},`
`11`		`- "scripts": {`
`12`		`- "update-grammar": "node ../node_modules/vscode-grammar-updater/bin dart-lang/dart-syntax-highlight grammars/dart.json ./syntaxes/dart.tmLanguage.json"`
`13`		`- },`
	`11`	`+ "scripts": {`
	`12`	`+ "update-grammar": "node ../node_modules/vscode-grammar-updater/bin dart-lang/dart-syntax-highlight grammars/dart.json ./syntaxes/dart.tmLanguage.json"`
	`13`	`+ },`
	`14`	`+ "categories": [`
	`15`	`+ "Programming Languages"`
	`16`	`+ ],`
`14`	`17`	`"contributes": {`
`15`	`18`	`"languages": [`
`16`	`19`	`{`
`@@ -26,9 +29,9 @@`
`26`	`29`	`],`
`27`	`30`	`"grammars": [`
`28`	`31`	`{`
`29`		`- "language": "dart",`
`30`		`- "scopeName": "source.dart",`
`31`		`- "path": "./syntaxes/dart.tmLanguage.json"`
	`32`	`+ "language": "dart",`
	`33`	`+ "scopeName": "source.dart",`
	`34`	`+ "path": "./syntaxes/dart.tmLanguage.json"`
`32`	`35`	`}`
`33`	`36`	`]`
`34`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`"scripts": {`
`13`	`13`	`"update-grammar": "node ../node_modules/vscode-grammar-updater/bin textmate/ini.tmbundle Syntaxes/Ini.plist ./syntaxes/ini.tmLanguage.json"`
`14`	`14`	`},`
	`15`	`+ "categories": ["Programming Languages"],`
`15`	`16`	`"contributes": {`
`16`	`17`	`"languages": [`
`17`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`"engines": {`
`9`	`9`	`"vscode": "^1.20.0"`
`10`	`10`	`},`
	`11`	`+ "categories": ["Programming Languages"],`
`11`	`12`	`"contributes": {`
`12`	`13`	`"languages": [`
`13`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`"engines": {`
`9`	`9`	`"vscode": "*"`
`10`	`10`	`},`
	`11`	`+ "categories": ["Programming Languages"],`
`11`	`12`	`"contributes": {`
`12`	`13`	`"languages": [`
`13`	`14`	`{`