From e76a5b5bbbcad095320db8f9368163d28cb22a2e Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Fri, 29 Jan 2021 01:01:22 +0100 Subject: [PATCH] Adopt latest `monaco-editor` --- README.md | 4 ++-- package-lock.json | 6 +++--- package.json | 4 ++-- src/features.ts | 24 ++++++++++++++++-------- src/languages.ts | 10 +++++++++- 5 files changed, 32 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 300f73d9..f97316bd 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', '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']`. + * default value: `['abap', 'apex', 'azcli', 'bat', 'cameligo', 'clojure', 'coffee', 'cpp', 'csharp', 'csp', 'css', 'dart', 'dockerfile', 'ecl', 'fsharp', 'go', 'graphql', 'handlebars', 'hcl', 'html', 'ini', 'java', 'javascript', 'json', 'julia', 'kotlin', 'less', 'lexon', 'lua', 'm3', '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,7 +68,7 @@ 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', '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']`. + * default value: `['accessibilityHelp', 'anchorSelect', 'bracketMatching', 'caretOperations', 'clipboard', 'codeAction', 'codelens', 'colorPicker', 'comment', 'contextmenu', 'coreCommands', 'cursorUndo', 'dnd', 'documentSymbols', 'find', 'folding', 'fontZoom', 'format', 'gotoError', 'gotoLine', 'gotoSymbol', 'hover', 'iPadShowKeyboard', 'inPlaceReplace', 'indentation', 'inlineHints', 'inspectTokens', 'linesOperations', 'linkedEditing', 'links', 'multicursor', '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 diff --git a/package-lock.json b/package-lock.json index 65b4fad6..0b416720 100644 --- a/package-lock.json +++ b/package-lock.json @@ -911,9 +911,9 @@ "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" }, "monaco-editor": { - "version": "0.21.2", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.21.2.tgz", - "integrity": "sha512-jS51RLuzMaoJpYbu7F6TPuWpnWTLD4kjRW0+AZzcryvbxrTwhNy1KC9yboyKpgMTahpUbDUsuQULoo0GV1EPqg==", + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.22.0.tgz", + "integrity": "sha512-hr0TB1ykyfvtSpr+5+r13910k1daWx7hrV+Bicc5gC4HDtr1K0lEcN9h5X+aFL96OiWx68dsRaaQbKGjTz1B+A==", "dev": true }, "nanoid": { diff --git a/package.json b/package.json index 912aac9e..59a4741f 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,13 @@ "homepage": "https://github.com/Microsoft/monaco-editor-webpack-plugin#readme", "peerDependencies": { "webpack": "^4.5.0 || 5.x", - "monaco-editor": "0.21.x" + "monaco-editor": "0.22.x" }, "devDependencies": { "css-loader": "^5.0.1", "file-loader": "^6.2.0", "glob": "^7.1.6", - "monaco-editor": "^0.21.2", + "monaco-editor": "^0.22.0", "style-loader": "^2.0.0", "typescript": "^4.1.3", "webpack": "^5.11.0", diff --git a/src/features.ts b/src/features.ts index 290693c0..e8206863 100644 --- a/src/features.ts +++ b/src/features.ts @@ -34,8 +34,8 @@ export const featuresArr: IFeatureDefinition[] = [ entry: 'vs/editor/contrib/codelens/codelensController' }, { - label: 'colorDetector', - entry: 'vs/editor/contrib/colorPicker/colorDetector' + label: 'colorPicker', + entry: 'vs/editor/contrib/colorPicker/colorContributions' }, { label: 'comment', @@ -57,6 +57,10 @@ export const featuresArr: IFeatureDefinition[] = [ label: 'dnd', entry: 'vs/editor/contrib/dnd/dnd' }, + { + label: 'documentSymbols', + entry: 'vs/editor/contrib/documentSymbols/documentSymbols' + }, { label: 'find', entry: 'vs/editor/contrib/find/findController' @@ -104,6 +108,10 @@ export const featuresArr: IFeatureDefinition[] = [ label: 'indentation', entry: 'vs/editor/contrib/indentation/indentation' }, + { + label: 'inlineHints', + entry: 'vs/editor/contrib/inlineHints/inlineHintsController' + }, { label: 'inspectTokens', entry: 'vs/editor/standalone/browser/inspectTokens/inspectTokens' @@ -112,6 +120,10 @@ export const featuresArr: IFeatureDefinition[] = [ label: 'linesOperations', entry: 'vs/editor/contrib/linesOperations/linesOperations' }, + { + label: 'linkedEditing', + entry: 'vs/editor/contrib/linkedEditing/linkedEditing' + }, { label: 'links', entry: 'vs/editor/contrib/links/links' @@ -120,10 +132,6 @@ 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' @@ -194,6 +202,6 @@ export const featuresArr: IFeatureDefinition[] = [ } ]; -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 EditorFeature = 'accessibilityHelp' | 'anchorSelect' | 'bracketMatching' | 'caretOperations' | 'clipboard' | 'codeAction' | 'codelens' | 'colorPicker' | 'comment' | 'contextmenu' | 'coreCommands' | 'cursorUndo' | 'dnd' | 'documentSymbols' | 'find' | 'folding' | 'fontZoom' | 'format' | 'gotoError' | 'gotoLine' | 'gotoSymbol' | 'hover' | 'iPadShowKeyboard' | 'inPlaceReplace' | 'indentation' | 'inlineHints' | 'inspectTokens' | 'linesOperations' | 'linkedEditing' | 'links' | 'multicursor' | 'parameterHints' | 'quickCommand' | 'quickHelp' | 'quickOutline' | 'referenceSearch' | 'rename' | 'smartSelect' | 'snippets' | 'suggest' | 'toggleHighContrast' | 'toggleTabFocusMode' | 'transpose' | 'unusualLineTerminators' | 'viewportSemanticTokens' | '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'; +export type NegatedEditorFeature = '!accessibilityHelp' | '!anchorSelect' | '!bracketMatching' | '!caretOperations' | '!clipboard' | '!codeAction' | '!codelens' | '!colorPicker' | '!comment' | '!contextmenu' | '!coreCommands' | '!cursorUndo' | '!dnd' | '!documentSymbols' | '!find' | '!folding' | '!fontZoom' | '!format' | '!gotoError' | '!gotoLine' | '!gotoSymbol' | '!hover' | '!iPadShowKeyboard' | '!inPlaceReplace' | '!indentation' | '!inlineHints' | '!inspectTokens' | '!linesOperations' | '!linkedEditing' | '!links' | '!multicursor' | '!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 6292d80b..89eb771b 100644 --- a/src/languages.ts +++ b/src/languages.ts @@ -64,6 +64,10 @@ export const languagesArr: IFeatureDefinition[] = [ label: 'dockerfile', entry: 'vs/basic-languages/dockerfile/dockerfile.contribution' }, + { + label: 'ecl', + entry: 'vs/basic-languages/ecl/ecl.contribution' + }, { label: 'fsharp', entry: 'vs/basic-languages/fsharp/fsharp.contribution' @@ -135,6 +139,10 @@ export const languagesArr: IFeatureDefinition[] = [ label: 'lua', entry: 'vs/basic-languages/lua/lua.contribution' }, + { + label: 'm3', + entry: 'vs/basic-languages/m3/m3.contribution' + }, { label: 'markdown', entry: 'vs/basic-languages/markdown/markdown.contribution' @@ -300,5 +308,5 @@ export const languagesArr: IFeatureDefinition[] = [ } ]; -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'; +export type EditorLanguage = 'abap' | 'apex' | 'azcli' | 'bat' | 'cameligo' | 'clojure' | 'coffee' | 'cpp' | 'csharp' | 'csp' | 'css' | 'dart' | 'dockerfile' | 'ecl' | 'fsharp' | 'go' | 'graphql' | 'handlebars' | 'hcl' | 'html' | 'ini' | 'java' | 'javascript' | 'json' | 'julia' | 'kotlin' | 'less' | 'lexon' | 'lua' | 'm3' | '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';