@codingame/monaco-vscode-monarch-service-override 11.1.2 → 12.0.0

package/index.d.ts

@@ -1 +1,2 @@
-export { default } from 'vscode/service-override/monarch';
+import { type IEditorOverrideServices } from "vscode/vscode/vs/editor/standalone/browser/standaloneServices";
+export default function getServiceOverride(): IEditorOverrideServices;

package/index.js

@@ -1 +1,10 @@
-export { default } from './monarch.js';
+
+import 'vscode/vscode/vs/editor/standalone/browser/standaloneServices';
+import './vscode/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.js';
+import './vscode/src/vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast.js';
+
+function getServiceOverride() {
+    return {};
+}
+
+export { getServiceOverride as default };

package/package.json

@@ -1,6 +1,8 @@
 {
   "name": "@codingame/monaco-vscode-monarch-service-override",
-  "version": "11.1.2",
+  "version": "12.0.0",
+  "private": false,
+  "description": "VSCode public API plugged on the monaco editor - monarch service-override",
   "keywords": [],
   "author": {
     "name": "CodinGame",
@@ -12,8 +14,11 @@
     "url": "git+ssh://git@github.com/CodinGame/monaco-vscode-api.git"
   },
   "type": "module",
-  "private": false,
-  "description": "VSCode public API plugged on the monaco editor - monarch service-override",
+  "dependencies": {
+    "vscode": "npm:@codingame/monaco-vscode-api@12.0.0"
+  },
+  "peerDependencies": {},
+  "peerDependenciesMeta": {},
   "main": "index.js",
   "module": "index.js",
   "types": "index.d.ts",
@@ -22,10 +27,12 @@
       "default": "./index.js"
     },
     "./vscode/*": {
-      "default": "./vscode/src/*.js"
+      "default": "./vscode/src/*.js",
+      "types": "./vscode/src/*.d.ts"
+    },
+    "./*": {
+      "default": "./*.js",
+      "types": "./*.d.ts"
     }
-  },
-  "dependencies": {
-    "vscode": "npm:@codingame/monaco-vscode-api@11.1.2"
   }
 }

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

@@ -1,4 +1,4 @@
-import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css.js';
+import n from 'vscode/external/rollup-plugin-styles/dist/runtime/inject-css';
 
 var css = ".monaco-editor .tokens-inspect-widget{background-color:var(--vscode-editorHoverWidget-background);border:1px solid var(--vscode-editorHoverWidget-border);color:var(--vscode-editorHoverWidget-foreground);padding:10px;user-select:text;-webkit-user-select:text;z-index:50}.monaco-editor.hc-black .tokens-inspect-widget,.monaco-editor.hc-light .tokens-inspect-widget{border-width:2px}.monaco-editor .tokens-inspect-widget .tokens-inspect-separator{background-color:var(--vscode-editorHoverWidget-border);border:0;height:1px}.monaco-editor .tokens-inspect-widget .tm-token{font-family:var(--monaco-monospace-font)}.monaco-editor .tokens-inspect-widget .tm-token-length{float:right;font-size:60%;font-weight:400}.monaco-editor .tokens-inspect-widget .tm-metadata-table{width:100%}.monaco-editor .tokens-inspect-widget .tm-metadata-value{font-family:var(--monaco-monospace-font);text-align:right}.monaco-editor .tokens-inspect-widget .tm-token-type{font-family:var(--monaco-monospace-font)}";
 n(css,{});

package/vscode/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.d.ts

@@ -0,0 +1 @@
+

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

@@ -1,11 +1,15 @@
-import { __decorate, __param } from 'vscode/external/tslib/tslib.es6.js';
+
+import { __decorate, __param } from 'vscode/external/tslib/tslib.es6';
 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 +30,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 +75,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 +172,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 +223,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);

package/vscode/src/vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast.d.ts

@@ -0,0 +1 @@
+export {};

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

@@ -1,3 +1,4 @@
+
 import { EditorAction, registerEditorAction } from 'vscode/vscode/vs/editor/browser/editorExtensions';
 import { IStandaloneThemeService } from 'vscode/vscode/vs/editor/standalone/common/standaloneTheme';
 import { ToggleHighContrastNLS } from 'vscode/vscode/vs/editor/common/standaloneStrings';

package/monarch.js

@@ -1,8 +0,0 @@
-import './vscode/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.js';
-import './vscode/src/vs/editor/standalone/browser/toggleHighContrast/toggleHighContrast.js';
-
-function getServiceOverride() {
-    return {};
-}
-
-export { getServiceOverride as default };