Upgrade to Monaco 0.20.0

examples/api-tests/src/saveable.spec.js

@@ -62,6 +62,7 @@ describe('Saveable', function () {
 
     const toTearDown = new DisposableCollection();
 
+    /** @type {string | undefined} */
     const autoSave = preferences.get('editor.autoSave', undefined, rootUri.toString());
 
     beforeEach(async () => {

examples/api-tests/src/typescript.spec.js

@@ -39,6 +39,7 @@ describe('TypeScript', function () {
     const { ProgressStatusBarItem } = require('@theia/core/lib/browser/progress-status-bar-item');
     const { FileService } = require('@theia/filesystem/lib/browser/file-service');
     const { PluginViewRegistry } = require('@theia/plugin-ext/lib/main/browser/view/plugin-view-registry');
+    const { Deferred } = require('@theia/core/lib/common/promise-util');
 
     const container = window.theia.container;
     const editorManager = container.get(EditorManager);
@@ -504,7 +505,7 @@ module.exports = (port, host, argv) => Promise.resolve()
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isFalse(contextKeyService.match('renameInputVisible'));
 
-        const renaming = commands.executeCommand('editor.action.rename');
+        commands.executeCommand('editor.action.rename');
         await waitForAnimation(() => contextKeyService.match('renameInputVisible')
             && document.activeElement instanceof HTMLInputElement
             && document.activeElement.selectionEnd === 'container'.length);
@@ -520,7 +521,11 @@ module.exports = (port, host, argv) => Promise.resolve()
         input.value = 'foo';
         keybindings.dispatchKeyDown('Enter', input);
 
-        await renaming;
+        // all rename edits should be grouped in one edit operation and applied in the same tick
+        const waitForApplyRenameEdits = new Deferred();
+        editor.getControl().onDidChangeModelContent(waitForApplyRenameEdits.resolve);
+        await waitForApplyRenameEdits.promise;
+
         assert.isTrue(contextKeyService.match('editorTextFocus'));
         assert.isFalse(contextKeyService.match('renameInputVisible'));
 

packages/console/src/browser/console-widget.ts

@@ -103,10 +103,11 @@ export class ConsoleWidget extends BaseWidget implements StatefulWidget {
         this.toDispose.push(input);
         this.toDispose.push(input.getControl().onDidLayoutChange(() => this.resizeContent()));
 
-        // todo update font if fontInfo was changed only
-        // it's impossible at the moment, but will be fixed for next upgrade of monaco version
-        // see https://github.com/microsoft/vscode/commit/5084e8ca1935698c98c163e339ca664818786c6d
-        this.toDispose.push(input.getControl().onDidChangeConfiguration(() => this.updateFont()));
+        this.toDispose.push(input.getControl().onDidChangeConfiguration(event => {
+            if (event.hasChanged(monaco.editor.EditorOption.fontInfo)) {
+                this.updateFont();
+            }
+        }));
 
         this.updateFont();
         if (inputFocusContextKey) {

packages/core/package.json

@@ -47,8 +47,8 @@
     "reflect-metadata": "^0.1.10",
     "route-parser": "^0.0.5",
     "safer-buffer": "^2.1.2",
-    "vscode-languageserver-protocol": "^3.15.0-next.8",
-    "vscode-languageserver-types": "^3.15.0-next",
+    "vscode-languageserver-types": "^3.15.1",
+    "vscode-languageserver-protocol": "^3.15.3",
     "vscode-uri": "^2.1.1",
     "vscode-ws-jsonrpc": "^0.2.0",
     "ws": "^7.1.2",
@@ -107,4 +107,4 @@
   "nyc": {
     "extends": "../../configs/nyc.json"
   }
-}
+}

packages/debug/package.json

@@ -18,7 +18,7 @@
     "@theia/userstorage": "^1.4.0",
     "@theia/variable-resolver": "^1.4.0",
     "@theia/workspace": "^1.4.0",
-    "jsonc-parser": "^2.0.2",
+    "jsonc-parser": "^2.2.0",
     "mkdirp": "^0.5.0",
     "p-debounce": "^2.1.0",
     "requestretry": "^3.1.0",

packages/editor/src/browser/editor-preferences.ts

@@ -35,7 +35,7 @@ const platform = {
     isLinux: OS.type() === OS.Type.Linux
 };
 
-// should be in sync with https://github.com/theia-ide/vscode/blob/standalone/0.19.x/src/vs/editor/common/config/editorOptions.ts#L2974
+// should be in sync with https://github.com/theia-ide/vscode/blob/standalone/0.20.x/src/vs/editor/common/config/editorOptions.ts#L3042
 export const EDITOR_FONT_DEFAULTS = {
     fontFamily: (
         isOSX ? DEFAULT_MAC_FONT_FAMILY : (isWindows ? DEFAULT_WINDOWS_FONT_FAMILY : DEFAULT_LINUX_FONT_FAMILY)
@@ -48,7 +48,7 @@ export const EDITOR_FONT_DEFAULTS = {
     letterSpacing: 0,
 };
 
-// should be in sync with https://github.com/theia-ide/vscode/blob/standalone/0.19.x/src/vs/editor/common/config/editorOptions.ts#L2989
+// should be in sync with https://github.com/theia-ide/vscode/blob/standalone/0.20.x/src/vs/editor/common/config/editorOptions.ts#L3057
 export const EDITOR_MODEL_DEFAULTS = {
     tabSize: 4,
     indentSize: 4,
@@ -62,11 +62,11 @@ export const EDITOR_MODEL_DEFAULTS = {
 
 /* eslint-disable max-len */
 // should be in sync with:
-//        1. https://github.com/theia-ide/vscode/blob/standalone/0.19.x/src/vs/editor/common/config/commonEditorConfig.ts#L442
-//        2. https://github.com/theia-ide/vscode/blob/standalone/0.19.x/src/vs/editor/common/config/commonEditorConfig.ts#L526
+//        1. https://github.com/theia-ide/vscode/blob/standalone/0.20.x/src/vs/editor/common/config/commonEditorConfig.ts#L441
+//        2. https://github.com/theia-ide/vscode/blob/standalone/0.20.x/src/vs/editor/common/config/commonEditorConfig.ts#L530
 
-// 1. Copy from https://github.com/theia-ide/vscode/blob/standalone/0.19.x/src/vs/editor/common/config/commonEditorConfig.ts#L526
-// 2. Align first items with https://github.com/theia-ide/vscode/blob/standalone/0.19.x/src/vs/editor/common/config/commonEditorConfig.ts#L442
+// 1. Copy from https://github.com/theia-ide/vscode/blob/standalone/0.20.x/src/vs/editor/common/config/commonEditorConfig.ts#L530
+// 2. Align first items with https://github.com/theia-ide/vscode/blob/standalone/0.20.x/src/vs/editor/common/config/commonEditorConfig.ts#L441
 // 3. Find -> Use Regular Expressions to clean up data and replace " by ', for example -> nls\.localize\(.*, "(.*)"\) -> "$1"
 // 4. Apply `quotemark` quick fixes
 // 5. Fix the rest manually
@@ -102,6 +102,11 @@ const codeEditorPreferenceProperties = {
         'default': true,
         'description': 'Controls whether completions should be computed based on words in the document.'
     },
+    'editor.semanticHighlighting.enabled': {
+        'type': 'boolean',
+        'default': false,
+        'description': 'Controls whether the semanticHighlighting is shown for the languages that support it.'
+    },
     'editor.stablePeek': {
         'type': 'boolean',
         'default': false,
@@ -269,6 +274,11 @@ const codeEditorPreferenceProperties = {
         'type': 'boolean',
         'default': true
     },
+    'editor.comments.insertSpace': {
+        'type': 'boolean',
+        'default': true,
+        'description': 'Controls whether a space character is inserted when commenting.'
+    },
     'editor.copyWithSyntaxHighlighting': {
         'description': 'Controls whether syntax highlighting should be copied into the clipboard.',
         'type': 'boolean',
@@ -391,6 +401,11 @@ const codeEditorPreferenceProperties = {
         ],
         'default': 'auto'
     },
+    'editor.foldingHighlight': {
+        'description': 'Controls whether the editor should highlight folded ranges.',
+        'type': 'boolean',
+        'default': true
+    },
     'editor.fontFamily': {
         'description': 'Controls the font family.',
         'type': 'string',
@@ -730,6 +745,19 @@ const codeEditorPreferenceProperties = {
         'default': false,
         'description': 'Controls whether the parameter hints menu cycles or closes when reaching the end of the list.'
     },
+    'editor.peekWidgetDefaultFocus': {
+        'enumDescriptions': [
+            'Focus the tree when opening peek',
+            'Focus the editor when opening peek'
+        ],
+        'description': 'Controls whether to focus the inline editor or the tree in the peek widget.',
+        'type': 'string',
+        'enum': [
+            'tree',
+            'editor'
+        ],
+        'default': 'tree'
+    },
     'editor.quickSuggestions': {
         'anyOf': [
             {
@@ -927,7 +955,7 @@ const codeEditorPreferenceProperties = {
     'editor.suggest.snippetsPreventQuickSuggestions': {
         'type': 'boolean',
         'default': true,
-        'description': 'Control whether an active snippet prevents quick suggestions.'
+        'description': 'Controls whether an active snippet prevents quick suggestions.'
     },
     'editor.suggest.showIcons': {
         'type': 'boolean',
@@ -1076,6 +1104,11 @@ const codeEditorPreferenceProperties = {
         'default': true,
         'markdownDescription': 'When enabled IntelliSense shows `snippet`-suggestions.'
     },
+    'editor.suggest.hideStatusBar': {
+        'type': 'boolean',
+        'default': true,
+        'markdownDescription': 'Controls the visibility of the status bar at the bottom of the suggest widget.'
+    },
     'editor.suggestFontSize': {
         'markdownDescription': 'Font size for the suggest widget. When set to `0`, the value of `#editor.fontSize#` is used.',
         'type': 'integer',
@@ -1175,6 +1208,19 @@ const codeEditorPreferenceProperties = {
             'deepIndent'
         ],
         'default': 'same'
+    },
+    'editor.wrappingStrategy': {
+        'enumDescriptions': [
+            'Assumes that all characters are of the same width. This is a fast algorithm that works correctly for monospace fonts and certain scripts (like Latin characters) where glyphs are of equal width.',
+            'Delegates wrapping points computation to the browser. This is a slow algorithm, that might cause freezes for large files, but it works correctly in all cases.'
+        ],
+        'description': 'Controls the algorithm that computes wrapping points.',
+        'type': 'string',
+        'enum': [
+            'simple',
+            'advanced'
+        ],
+        'default': 'simple'
     }
 };
 /* eslint-enable max-len */

packages/keymaps/package.json

@@ -10,7 +10,7 @@
     "@types/lodash.debounce": "4.0.3",
     "ajv": "^6.5.3",
     "fuzzy": "^0.1.3",
-    "jsonc-parser": "^2.0.2",
+    "jsonc-parser": "^2.2.0",
     "lodash.debounce": "^4.0.8"
   },
   "devDependencies": {

packages/monaco/package.json

@@ -6,16 +6,16 @@
     "@theia/core": "^1.4.0",
     "@theia/editor": "^1.4.0",
     "@theia/filesystem": "^1.4.0",
-    "@theia/monaco-editor-core": "^0.19.3",
+    "@theia/monaco-editor-core": "^0.20.0",
     "@theia/markers": "^1.4.0",
     "@theia/outline-view": "^1.4.0",
     "@theia/workspace": "^1.4.0",
     "deepmerge": "2.0.1",
     "fast-plist": "^0.1.2",
     "idb": "^4.0.5",
-    "jsonc-parser": "^2.0.2",
+    "jsonc-parser": "^2.2.0",
     "onigasm": "^2.2.0",
-    "vscode-textmate": "^4.0.1"
+    "vscode-textmate": "^4.4.0"
   },
   "publishConfig": {
     "access": "public"

packages/monaco/src/browser/monaco-bulk-edit-service.ts

@@ -23,8 +23,29 @@ export class MonacoBulkEditService implements monaco.editor.IBulkEditService {
     @inject(MonacoWorkspace)
     protected readonly workspace: MonacoWorkspace;
 
+    private _previewHandler?: monaco.editor.IBulkEditPreviewHandler;
+
     apply(edit: monaco.languages.WorkspaceEdit): Promise<monaco.editor.IBulkEditResult & { success: boolean }> {
         return this.workspace.applyBulkEdit(edit);
     }
 
+    hasPreviewHandler(): boolean {
+        return Boolean(this._previewHandler);
+    }
+
+    setPreviewHandler(handler: monaco.editor.IBulkEditPreviewHandler): monaco.IDisposable {
+        this._previewHandler = handler;
+
+        const disposePreviewHandler = () => {
+            if (this._previewHandler === handler) {
+                this._previewHandler = undefined;
+            }
+        };
+
+        return {
+            dispose(): void {
+                disposePreviewHandler();
+            }
+        };
+    }
 }