From 1a0f0274a03a2f78b6c1ad2a27d93ba059f7713b Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 21 Sep 2020 11:51:11 +0200 Subject: [PATCH] adopt latest `monaco-editor` --- README.md | 11 +-- package-lock.json | 168 +++++++++++++++++---------------------- package.json | 13 +-- scripts/import-editor.js | 10 ++- src/features.ts | 34 ++++++-- src/languages.ts | 26 +++++- 6 files changed, 146 insertions(+), 116 deletions(-) diff --git a/README.md b/README.md index 58711974..300f73d9 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Options can be passed in to `MonacoWebpackPlugin`. They can be used to generate * `publicPath` (`string`) - custom public path for worker scripts, overrides the public path from which files generated by this plugin will be served. This wins out over Webpack's dynamic runtime path and can be useful to avoid attempting to load workers cross-origin when using a CDN for other static resources. Use e.g. '/' if you want to load your resources from the current origin.. * default value: `''`. * `languages` (`string[]`) - include only a subset of the languages supported. - * default value: `['abap', 'apex', 'azcli', 'bat', 'cameligo', 'clojure', 'coffee', 'cpp', 'csharp', 'csp', 'css', 'dockerfile', 'fsharp', 'go', 'graphql', 'handlebars', 'html', 'ini', 'java', 'javascript', 'json', 'kotlin', 'less', 'lua', 'markdown', 'mips', 'msdax', 'mysql', 'objective-c', 'pascal', 'pascaligo', 'perl', 'pgsql', 'php', 'postiats', 'powerquery', 'powershell', 'pug', 'python', 'r', 'razor', 'redis', 'redshift', 'restructuredtext', 'ruby', 'rust', 'sb', 'scheme', 'scss', 'shell', 'solidity', 'sophia', 'sql', 'st', 'swift', 'tcl', 'twig', 'typescript', 'vb', 'xml', 'yaml']`. + * default value: `['abap', 'apex', 'azcli', 'bat', 'cameligo', 'clojure', 'coffee', 'cpp', 'csharp', 'csp', 'css', 'dart', 'dockerfile', 'fsharp', 'go', 'graphql', 'handlebars', 'hcl', 'html', 'ini', 'java', 'javascript', 'json', 'julia', 'kotlin', 'less', 'lexon', 'lua', 'markdown', 'mips', 'msdax', 'mysql', 'objective-c', 'pascal', 'pascaligo', 'perl', 'pgsql', 'php', 'postiats', 'powerquery', 'powershell', 'pug', 'python', 'r', 'razor', 'redis', 'redshift', 'restructuredtext', 'ruby', 'rust', 'sb', 'scala', 'scheme', 'scss', 'shell', 'solidity', 'sophia', 'sql', 'st', 'swift', 'systemverilog', 'tcl', 'twig', 'typescript', 'vb', 'xml', 'yaml']`. Some languages share the same web worker. If one of the following languages is included, you must also include the language responsible for instantiating their shared worker: @@ -68,16 +68,17 @@ Options can be passed in to `MonacoWebpackPlugin`. They can be used to generate * `features` (`string[]`) - include only a subset of the editor features. - * default value: `['accessibilityHelp', 'bracketMatching', 'caretOperations', 'clipboard', 'codeAction', 'codelens', 'colorDetector', 'comment', 'contextmenu', 'coreCommands', 'cursorUndo', 'dnd', 'find', 'folding', 'fontZoom', 'format', 'gotoError', 'gotoLine', 'gotoSymbol', 'hover', 'iPadShowKeyboard', 'inPlaceReplace', 'inspectTokens', 'linesOperations', 'links', 'multicursor', 'parameterHints', 'quickCommand', 'quickOutline', 'referenceSearch', 'rename', 'smartSelect', 'snippets', 'suggest', 'toggleHighContrast', 'toggleTabFocusMode', 'transpose', 'wordHighlighter', 'wordOperations', 'wordPartOperations']`. + * default value: `['accessibilityHelp', 'anchorSelect', 'bracketMatching', 'caretOperations', 'clipboard', 'codeAction', 'codelens', 'colorDetector', 'comment', 'contextmenu', 'coreCommands', 'cursorUndo', 'dnd', 'find', 'folding', 'fontZoom', 'format', 'gotoError', 'gotoLine', 'gotoSymbol', 'hover', 'iPadShowKeyboard', 'inPlaceReplace', 'indentation', 'inspectTokens', 'linesOperations', 'links', 'multicursor', 'onTypeRename', 'parameterHints', 'quickCommand', 'quickHelp', 'quickOutline', 'referenceSearch', 'rename', 'smartSelect', 'snippets', 'suggest', 'toggleHighContrast', 'toggleTabFocusMode', 'transpose', 'unusualLineTerminators', 'viewportSemanticTokens', 'wordHighlighter', 'wordOperations', 'wordPartOperations']`. * excluded features: It is also possible to exclude certain default features prefixing them with an exclamation mark '!'. ## Version Matrix | `monaco-editor-webpack-plugin` | `monaco-editor` | |---|---| -| `1.9.x` | `0.20.x` | -| `1.8.x` | `0.19.x` | -| `1.7.x` | `0.18.x` +| `2.*.*` | `0.21.*` | +| `1.9.*` | `0.20.*` | +| `1.8.*` | `0.19.*` | +| `1.7.*` | `0.18.*` | ## Contributing diff --git a/package-lock.json b/package-lock.json index e2e0d9e6..691fafd1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,9 +27,9 @@ } }, "@types/node": { - "version": "14.6.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.6.4.tgz", - "integrity": "sha512-Wk7nG1JSaMfMpoMJDKUsWYugliB2Vy55pdjLpmLixeyMi7HizW2I/9QoxsPCkXl3dO+ZOVqPumKaDUv5zJu2uQ==", + "version": "14.11.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz", + "integrity": "sha512-oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw==", "dev": true }, "@types/source-list-map": { @@ -280,9 +280,9 @@ "dev": true }, "ajv": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", - "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", + "version": "6.12.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", + "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -1068,9 +1068,9 @@ } }, "css-loader": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.2.2.tgz", - "integrity": "sha512-omVGsTkZPVwVRpckeUnLshPp12KsmMSLqYxs12+RzM9jRR5Y+Idn/tBffjXRvOE+qW7if24cuceFJqYR5FmGBg==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.3.0.tgz", + "integrity": "sha512-rdezjCjScIrsL8BSYszgT4s476IcNKt6yX69t0pHjJVnPUTDpn4WfIpDQTN3wCJvUvfsz/mFjuGOekf3PY3NUg==", "dev": true, "requires": { "camelcase": "^6.0.0", @@ -1083,30 +1083,8 @@ "postcss-modules-scope": "^2.2.0", "postcss-modules-values": "^3.0.0", "postcss-value-parser": "^4.1.0", - "schema-utils": "^2.7.0", + "schema-utils": "^2.7.1", "semver": "^7.3.2" - }, - "dependencies": { - "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } } }, "cssesc": { @@ -1522,28 +1500,6 @@ "requires": { "loader-utils": "^2.0.0", "schema-utils": "^2.7.1" - }, - "dependencies": { - "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } } }, "file-uri-to-path": { @@ -2100,11 +2056,11 @@ "dev": true }, "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", + "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", "requires": { - "minimist": "^1.2.0" + "minimist": "^1.2.5" } }, "kind-of": { @@ -2120,13 +2076,13 @@ "dev": true }, "loader-utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", - "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", + "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", - "json5": "^1.0.1" + "json5": "^2.1.2" } }, "locate-path": { @@ -2316,9 +2272,9 @@ } }, "monaco-editor": { - "version": "0.20.0", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.20.0.tgz", - "integrity": "sha512-hkvf4EtPJRMQlPC3UbMoRs0vTAFAYdzFQ+gpMb8A+9znae1c43q8Mab9iVsgTcg/4PNiLGGn3SlDIa8uvK1FIQ==", + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.21.0.tgz", + "integrity": "sha512-fUmW7iC+wKWMetD44iVacEoSi+RqkA+C0vQvAk/FkEugg70iwGGLj5WoheAULaxLASQbYiapD2+85FJ0cnErYg==", "dev": true }, "move-concurrently": { @@ -2634,9 +2590,9 @@ "dev": true }, "postcss": { - "version": "7.0.32", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz", - "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==", + "version": "7.0.34", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.34.tgz", + "integrity": "sha512-H/7V2VeNScX9KE83GDrDZNiGT1m2H+UTnlinIzhjlLX9hfMUn1mHNnGeX81a1c8JSBdBvqk7c2ZOG6ZPn5itGw==", "dev": true, "requires": { "chalk": "^2.4.2", @@ -3338,28 +3294,6 @@ "requires": { "loader-utils": "^2.0.0", "schema-utils": "^2.6.6" - }, - "dependencies": { - "json5": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz", - "integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "loader-utils": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.0.tgz", - "integrity": "sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ==", - "dev": true, - "requires": { - "big.js": "^5.2.2", - "emojis-list": "^3.0.0", - "json5": "^2.1.2" - } - } } }, "supports-color": { @@ -3504,9 +3438,9 @@ "dev": true }, "typescript": { - "version": "3.9.7", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz", - "integrity": "sha512-BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz", + "integrity": "sha512-tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg==", "dev": true }, "union-value": { @@ -3798,9 +3732,9 @@ } }, "webpack": { - "version": "4.44.1", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.1.tgz", - "integrity": "sha512-4UOGAohv/VGUNQJstzEywwNxqX417FnjZgZJpJQegddzPmTvph37eBIRbRTfdySXzVtJXLJfbMN3mMYhM6GdmQ==", + "version": "4.44.2", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.44.2.tgz", + "integrity": "sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==", "dev": true, "requires": { "@webassemblyjs/ast": "1.9.0", @@ -3828,6 +3762,26 @@ "webpack-sources": "^1.4.1" }, "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + }, "schema-utils": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", @@ -3858,6 +3812,28 @@ "supports-color": "^6.1.0", "v8-compile-cache": "^2.1.1", "yargs": "^13.3.2" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + } } }, "webpack-sources": { diff --git a/package.json b/package.json index 34770652..74e3a4e8 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "test": "node ./node_modules/webpack/bin/webpack.js --config test/webpack.config.js --progress", "test-cross-origin": "node ./node_modules/webpack/bin/webpack.js --config test/webpack-cross-origin.config.js --progress", "watch": "tsc -w -p tsconfig.json", + "import-editor": "node ./scripts/import-editor.js", "prepublishOnly": "tsc -p tsconfig.json" }, "repository": { @@ -28,21 +29,21 @@ "homepage": "https://github.com/Microsoft/monaco-editor-webpack-plugin#readme", "peerDependencies": { "webpack": "^4.5.0", - "monaco-editor": "0.19.x || 0.20.x" + "monaco-editor": "0.21.x" }, "devDependencies": { "@types/loader-utils": "^2.0.1", "@types/webpack": "^4.41.22", - "css-loader": "^4.2.2", + "css-loader": "^4.3.0", "file-loader": "^6.1.0", "glob": "^7.1.6", - "monaco-editor": "^0.20.0", + "monaco-editor": "^0.21.0", "style-loader": "^1.2.1", - "typescript": "^3.7.5", - "webpack": "^4.44.1", + "typescript": "^4.0.3", + "webpack": "^4.44.2", "webpack-cli": "^3.3.12" }, "dependencies": { - "loader-utils": "^1.2.3" + "loader-utils": "^2.0.0" } } diff --git a/scripts/import-editor.js b/scripts/import-editor.js index b55e3000..b2af4f41 100644 --- a/scripts/import-editor.js +++ b/scripts/import-editor.js @@ -12,11 +12,13 @@ const customFeatureLabels = { 'vs/editor/contrib/caretOperations/caretOperations': 'caretOperations', 'vs/editor/contrib/caretOperations/transpose': 'transpose', 'vs/editor/contrib/colorPicker/colorDetector': 'colorDetector', + 'vs/editor/contrib/rename/onTypeRename': 'onTypeRename', 'vs/editor/contrib/gotoSymbol/link/goToDefinitionAtPosition': 'gotoSymbol', 'vs/editor/contrib/snippet/snippetController2': 'snippets', - 'vs/editor/standalone/browser/quickOpen/gotoLine': 'gotoLine', - 'vs/editor/standalone/browser/quickOpen/quickCommand': 'quickCommand', - 'vs/editor/standalone/browser/quickOpen/quickOutline': 'quickOutline', + 'vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess': 'gotoLine', + 'vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess': 'quickCommand', + 'vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess': 'quickOutline', + 'vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess': 'quickHelp', }; generateLanguages(); @@ -191,6 +193,8 @@ function generateFeatures() { 'vs/editor/common/standaloneStrings', 'vs/editor/contrib/tokenization/tokenization', 'vs/editor/editor.all', + 'vs/base/browser/ui/codicons/codiconStyles', + 'vs/editor/contrib/gotoSymbol/documentSymbols', ]; let features = []; diff --git a/src/features.ts b/src/features.ts index 667e250d..290693c0 100644 --- a/src/features.ts +++ b/src/features.ts @@ -9,6 +9,10 @@ export const featuresArr: IFeatureDefinition[] = [ label: 'accessibilityHelp', entry: 'vs/editor/standalone/browser/accessibilityHelp/accessibilityHelp' }, + { + label: 'anchorSelect', + entry: 'vs/editor/contrib/anchorSelect/anchorSelect' + }, { label: 'bracketMatching', entry: 'vs/editor/contrib/bracketMatching/bracketMatching' @@ -75,7 +79,7 @@ export const featuresArr: IFeatureDefinition[] = [ }, { label: 'gotoLine', - entry: 'vs/editor/standalone/browser/quickOpen/gotoLine' + entry: 'vs/editor/standalone/browser/quickAccess/standaloneGotoLineQuickAccess' }, { label: 'gotoSymbol', @@ -96,6 +100,10 @@ export const featuresArr: IFeatureDefinition[] = [ label: 'inPlaceReplace', entry: 'vs/editor/contrib/inPlaceReplace/inPlaceReplace' }, + { + label: 'indentation', + entry: 'vs/editor/contrib/indentation/indentation' + }, { label: 'inspectTokens', entry: 'vs/editor/standalone/browser/inspectTokens/inspectTokens' @@ -112,17 +120,25 @@ export const featuresArr: IFeatureDefinition[] = [ label: 'multicursor', entry: 'vs/editor/contrib/multicursor/multicursor' }, + { + label: 'onTypeRename', + entry: 'vs/editor/contrib/rename/onTypeRename' + }, { label: 'parameterHints', entry: 'vs/editor/contrib/parameterHints/parameterHints' }, { label: 'quickCommand', - entry: 'vs/editor/standalone/browser/quickOpen/quickCommand' + entry: 'vs/editor/standalone/browser/quickAccess/standaloneCommandsQuickAccess' + }, + { + label: 'quickHelp', + entry: 'vs/editor/standalone/browser/quickAccess/standaloneHelpQuickAccess' }, { label: 'quickOutline', - entry: 'vs/editor/standalone/browser/quickOpen/quickOutline' + entry: 'vs/editor/standalone/browser/quickAccess/standaloneGotoSymbolQuickAccess' }, { label: 'referenceSearch', @@ -156,6 +172,14 @@ export const featuresArr: IFeatureDefinition[] = [ label: 'transpose', entry: 'vs/editor/contrib/caretOperations/transpose' }, + { + label: 'unusualLineTerminators', + entry: 'vs/editor/contrib/unusualLineTerminators/unusualLineTerminators' + }, + { + label: 'viewportSemanticTokens', + entry: 'vs/editor/contrib/viewportSemanticTokens/viewportSemanticTokens' + }, { label: 'wordHighlighter', entry: 'vs/editor/contrib/wordHighlighter/wordHighlighter' @@ -170,6 +194,6 @@ export const featuresArr: IFeatureDefinition[] = [ } ]; -export type EditorFeature = 'accessibilityHelp' | 'bracketMatching' | 'caretOperations' | 'clipboard' | 'codeAction' | 'codelens' | 'colorDetector' | 'comment' | 'contextmenu' | 'coreCommands' | 'cursorUndo' | 'dnd' | 'find' | 'folding' | 'fontZoom' | 'format' | 'gotoError' | 'gotoLine' | 'gotoSymbol' | 'hover' | 'iPadShowKeyboard' | 'inPlaceReplace' | 'inspectTokens' | 'linesOperations' | 'links' | 'multicursor' | 'parameterHints' | 'quickCommand' | 'quickOutline' | 'referenceSearch' | 'rename' | 'smartSelect' | 'snippets' | 'suggest' | 'toggleHighContrast' | 'toggleTabFocusMode' | 'transpose' | 'wordHighlighter' | 'wordOperations' | 'wordPartOperations'; +export type EditorFeature = 'accessibilityHelp' | 'anchorSelect' | 'bracketMatching' | 'caretOperations' | 'clipboard' | 'codeAction' | 'codelens' | 'colorDetector' | 'comment' | 'contextmenu' | 'coreCommands' | 'cursorUndo' | 'dnd' | 'find' | 'folding' | 'fontZoom' | 'format' | 'gotoError' | 'gotoLine' | 'gotoSymbol' | 'hover' | 'iPadShowKeyboard' | 'inPlaceReplace' | 'indentation' | 'inspectTokens' | 'linesOperations' | 'links' | 'multicursor' | 'onTypeRename' | 'parameterHints' | 'quickCommand' | 'quickHelp' | 'quickOutline' | 'referenceSearch' | 'rename' | 'smartSelect' | 'snippets' | 'suggest' | 'toggleHighContrast' | 'toggleTabFocusMode' | 'transpose' | 'unusualLineTerminators' | 'viewportSemanticTokens' | 'wordHighlighter' | 'wordOperations' | 'wordPartOperations'; -export type NegatedEditorFeature = '!accessibilityHelp' | '!bracketMatching' | '!caretOperations' | '!clipboard' | '!codeAction' | '!codelens' | '!colorDetector' | '!comment' | '!contextmenu' | '!coreCommands' | '!cursorUndo' | '!dnd' | '!find' | '!folding' | '!fontZoom' | '!format' | '!gotoError' | '!gotoLine' | '!gotoSymbol' | '!hover' | '!iPadShowKeyboard' | '!inPlaceReplace' | '!inspectTokens' | '!linesOperations' | '!links' | '!multicursor' | '!parameterHints' | '!quickCommand' | '!quickOutline' | '!referenceSearch' | '!rename' | '!smartSelect' | '!snippets' | '!suggest' | '!toggleHighContrast' | '!toggleTabFocusMode' | '!transpose' | '!wordHighlighter' | '!wordOperations' | '!wordPartOperations'; +export type NegatedEditorFeature = '!accessibilityHelp' | '!anchorSelect' | '!bracketMatching' | '!caretOperations' | '!clipboard' | '!codeAction' | '!codelens' | '!colorDetector' | '!comment' | '!contextmenu' | '!coreCommands' | '!cursorUndo' | '!dnd' | '!find' | '!folding' | '!fontZoom' | '!format' | '!gotoError' | '!gotoLine' | '!gotoSymbol' | '!hover' | '!iPadShowKeyboard' | '!inPlaceReplace' | '!indentation' | '!inspectTokens' | '!linesOperations' | '!links' | '!multicursor' | '!onTypeRename' | '!parameterHints' | '!quickCommand' | '!quickHelp' | '!quickOutline' | '!referenceSearch' | '!rename' | '!smartSelect' | '!snippets' | '!suggest' | '!toggleHighContrast' | '!toggleTabFocusMode' | '!transpose' | '!unusualLineTerminators' | '!viewportSemanticTokens' | '!wordHighlighter' | '!wordOperations' | '!wordPartOperations'; diff --git a/src/languages.ts b/src/languages.ts index ca0702d2..6292d80b 100644 --- a/src/languages.ts +++ b/src/languages.ts @@ -56,6 +56,10 @@ export const languagesArr: IFeatureDefinition[] = [ entry: 'vs/language/css/css.worker' } }, + { + label: 'dart', + entry: 'vs/basic-languages/dart/dart.contribution' + }, { label: 'dockerfile', entry: 'vs/basic-languages/dockerfile/dockerfile.contribution' @@ -76,6 +80,10 @@ export const languagesArr: IFeatureDefinition[] = [ label: 'handlebars', entry: 'vs/basic-languages/handlebars/handlebars.contribution' }, + { + label: 'hcl', + entry: 'vs/basic-languages/hcl/hcl.contribution' + }, { label: 'html', entry: [ @@ -107,6 +115,10 @@ export const languagesArr: IFeatureDefinition[] = [ entry: 'vs/language/json/json.worker' } }, + { + label: 'julia', + entry: 'vs/basic-languages/julia/julia.contribution' + }, { label: 'kotlin', entry: 'vs/basic-languages/kotlin/kotlin.contribution' @@ -115,6 +127,10 @@ export const languagesArr: IFeatureDefinition[] = [ label: 'less', entry: 'vs/basic-languages/less/less.contribution' }, + { + label: 'lexon', + entry: 'vs/basic-languages/lexon/lexon.contribution' + }, { label: 'lua', entry: 'vs/basic-languages/lua/lua.contribution' @@ -211,6 +227,10 @@ export const languagesArr: IFeatureDefinition[] = [ label: 'sb', entry: 'vs/basic-languages/sb/sb.contribution' }, + { + label: 'scala', + entry: 'vs/basic-languages/scala/scala.contribution' + }, { label: 'scheme', entry: 'vs/basic-languages/scheme/scheme.contribution' @@ -243,6 +263,10 @@ export const languagesArr: IFeatureDefinition[] = [ label: 'swift', entry: 'vs/basic-languages/swift/swift.contribution' }, + { + label: 'systemverilog', + entry: 'vs/basic-languages/systemverilog/systemverilog.contribution' + }, { label: 'tcl', entry: 'vs/basic-languages/tcl/tcl.contribution' @@ -276,5 +300,5 @@ export const languagesArr: IFeatureDefinition[] = [ } ]; -export type EditorLanguage = 'abap' | 'apex' | 'azcli' | 'bat' | 'cameligo' | 'clojure' | 'coffee' | 'cpp' | 'csharp' | 'csp' | 'css' | 'dockerfile' | 'fsharp' | 'go' | 'graphql' | 'handlebars' | 'html' | 'ini' | 'java' | 'javascript' | 'json' | 'kotlin' | 'less' | 'lua' | 'markdown' | 'mips' | 'msdax' | 'mysql' | 'objective-c' | 'pascal' | 'pascaligo' | 'perl' | 'pgsql' | 'php' | 'postiats' | 'powerquery' | 'powershell' | 'pug' | 'python' | 'r' | 'razor' | 'redis' | 'redshift' | 'restructuredtext' | 'ruby' | 'rust' | 'sb' | 'scheme' | 'scss' | 'shell' | 'solidity' | 'sophia' | 'sql' | 'st' | 'swift' | 'tcl' | 'twig' | 'typescript' | 'vb' | 'xml' | 'yaml'; +export type EditorLanguage = 'abap' | 'apex' | 'azcli' | 'bat' | 'cameligo' | 'clojure' | 'coffee' | 'cpp' | 'csharp' | 'csp' | 'css' | 'dart' | 'dockerfile' | 'fsharp' | 'go' | 'graphql' | 'handlebars' | 'hcl' | 'html' | 'ini' | 'java' | 'javascript' | 'json' | 'julia' | 'kotlin' | 'less' | 'lexon' | 'lua' | 'markdown' | 'mips' | 'msdax' | 'mysql' | 'objective-c' | 'pascal' | 'pascaligo' | 'perl' | 'pgsql' | 'php' | 'postiats' | 'powerquery' | 'powershell' | 'pug' | 'python' | 'r' | 'razor' | 'redis' | 'redshift' | 'restructuredtext' | 'ruby' | 'rust' | 'sb' | 'scala' | 'scheme' | 'scss' | 'shell' | 'solidity' | 'sophia' | 'sql' | 'st' | 'swift' | 'systemverilog' | 'tcl' | 'twig' | 'typescript' | 'vb' | 'xml' | 'yaml';