@codingame/monaco-vscode-monarch-service-override 5.2.0 → 6.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codingame/monaco-vscode-monarch-service-override",
-  "version": "5.2.0",
+  "version": "6.0.0",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -26,6 +26,6 @@
     }
   },
   "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@5.2.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@6.0.0"
   }
 }

package/vscode/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.js

@@ -1,11 +1,14 @@
 import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
 import './inspectTokens.css.js';
 import { reset, $, append } from 'vscode/vscode/vs/base/browser/dom';
+import { CharCode } from 'vscode/vscode/vs/base/common/charCode';
 import { Color } from 'vscode/vscode/vs/base/common/color';
+import { KeyCode } from 'vscode/vscode/vs/base/common/keyCodes';
 import { Disposable } from 'vscode/vscode/vs/base/common/lifecycle';
-import { EditorAction, registerEditorContribution, registerEditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
+import { ContentWidgetPositionPreference } from 'vscode/vscode/vs/editor/browser/editorBrowser';
+import { EditorAction, registerEditorContribution, EditorContributionInstantiation, registerEditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { TokenizationRegistry } from 'vscode/vscode/vs/editor/common/languages';
-import { TokenMetadata } from 'vscode/vscode/vs/editor/common/encodedTokenAttributes';
+import { TokenMetadata, StandardTokenType, FontStyle } from 'vscode/vscode/vs/editor/common/encodedTokenAttributes';
 import { NullState, nullTokenize, nullTokenizeEncoded } from 'vscode/vscode/vs/editor/common/languages/nullTokenize';
 import { ILanguageService } from 'vscode/vscode/vs/editor/common/languages/language';
 import { IStandaloneThemeService } from 'vscode/vscode/vs/editor/standalone/common/standaloneTheme';
@@ -26,7 +29,7 @@ let InspectTokensController = class InspectTokensController extends Disposable {
         this._register(this._editor.onDidChangeModel((e) => this.stop()));
         this._register(this._editor.onDidChangeModelLanguage((e) => this.stop()));
         this._register(TokenizationRegistry.onDidChange((e) => this.stop()));
-        this._register(this._editor.onKeyUp((e) => e.keyCode === 9  && this.stop()));
+        this._register(this._editor.onKeyUp((e) => e.keyCode === KeyCode.Escape && this.stop()));
     }
     dispose() {
         this.stop();
@@ -71,10 +74,10 @@ function renderTokenText(tokenText) {
     for (let charIndex = 0, len = tokenText.length; charIndex < len; charIndex++) {
         const charCode = tokenText.charCodeAt(charIndex);
         switch (charCode) {
-            case 9 :
+            case CharCode.Tab:
                 result += '\u2192';
                 break;
-            case 32 :
+            case CharCode.Space:
                 result += '\u00B7';
                 break;
             default:
@@ -168,25 +171,25 @@ class InspectTokensWidget extends Disposable {
     }
     _tokenTypeToString(tokenType) {
         switch (tokenType) {
-            case 0 : return 'Other';
-            case 1 : return 'Comment';
-            case 2 : return 'String';
-            case 3 : return 'RegEx';
+            case StandardTokenType.Other: return 'Other';
+            case StandardTokenType.Comment: return 'Comment';
+            case StandardTokenType.String: return 'String';
+            case StandardTokenType.RegEx: return 'RegEx';
             default: return '??';
         }
     }
     _fontStyleToString(fontStyle) {
         let r = '';
-        if (fontStyle & 1 ) {
+        if (fontStyle & FontStyle.Italic) {
             r += 'italic ';
         }
-        if (fontStyle & 2 ) {
+        if (fontStyle & FontStyle.Bold) {
             r += 'bold ';
         }
-        if (fontStyle & 4 ) {
+        if (fontStyle & FontStyle.Underline) {
             r += 'underline ';
         }
-        if (fontStyle & 8 ) {
+        if (fontStyle & FontStyle.Strikethrough) {
             r += 'strikethrough ';
         }
         if (r.length === 0) {
@@ -219,9 +222,9 @@ class InspectTokensWidget extends Disposable {
     getPosition() {
         return {
             position: this._editor.getPosition(),
-            preference: [2 , 1 ]
+            preference: [ContentWidgetPositionPreference.BELOW, ContentWidgetPositionPreference.ABOVE]
         };
     }
 }
-registerEditorContribution(InspectTokensController.ID, InspectTokensController, 4 );
+registerEditorContribution(InspectTokensController.ID, InspectTokensController, EditorContributionInstantiation.Lazy);
 registerEditorAction(InspectTokens);