@codingame/monaco-vscode-monarch-service-override 25.1.2 → 26.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +2 -2
  2. package/vscode/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.js +98 -44
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@codingame/monaco-vscode-monarch-service-override",
3
- "version": "25.1.2",
3
+ "version": "26.0.0",
4
4
  "private": false,
5
5
  "description": "VSCode public API plugged on the monaco editor - monarch service-override",
6
6
  "keywords": [],
@@ -15,7 +15,7 @@
15
15
  },
16
16
  "type": "module",
17
17
  "dependencies": {
18
- "@codingame/monaco-vscode-api": "25.1.2"
18
+ "@codingame/monaco-vscode-api": "26.0.0"
19
19
  },
20
20
  "main": "index.js",
21
21
  "module": "index.js",
package/vscode/src/vs/editor/standalone/browser/inspectTokens/inspectTokens.js CHANGED
@@ -19,8 +19,12 @@ import { InspectTokensNLS } from '@codingame/monaco-vscode-api/vscode/vs/editor/
19
19
  var InspectTokensController_1;
20
20
  registerCss(inspectTokens);
21
21
  let InspectTokensController = class InspectTokensController extends Disposable {
22
- static { InspectTokensController_1 = this; }
23
- static { this.ID = 'editor.contrib.inspectTokens'; }
22
+ static {
23
+ InspectTokensController_1 = this;
24
+ }
25
+ static {
26
+ this.ID = "editor.contrib.inspectTokens";
27
+ }
24
28
  static get(editor) {
25
29
  return editor.getContribution(InspectTokensController_1.ID);
26
30
  }
@@ -29,10 +33,10 @@ let InspectTokensController = class InspectTokensController extends Disposable {
29
33
  this._editor = editor;
30
34
  this._languageService = languageService;
31
35
  this._widget = null;
32
- this._register(this._editor.onDidChangeModel((e) => this.stop()));
33
- this._register(this._editor.onDidChangeModelLanguage((e) => this.stop()));
34
- this._register(TokenizationRegistry.onDidChange((e) => this.stop()));
35
- this._register(this._editor.onKeyUp((e) => e.keyCode === KeyCode.Escape && this.stop()));
36
+ this._register(this._editor.onDidChangeModel(e => this.stop()));
37
+ this._register(this._editor.onDidChangeModelLanguage(e => this.stop()));
38
+ this._register(TokenizationRegistry.onDidChange(e => this.stop()));
39
+ this._register(this._editor.onKeyUp(e => e.keyCode === KeyCode.Escape && this.stop()));
36
40
  }
37
41
  dispose() {
38
42
  this.stop();
@@ -54,16 +58,13 @@ let InspectTokensController = class InspectTokensController extends Disposable {
54
58
  }
55
59
  }
56
60
  };
57
- InspectTokensController = InspectTokensController_1 = ( __decorate([
58
- ( __param(1, IStandaloneThemeService)),
59
- ( __param(2, ILanguageService))
60
- ], InspectTokensController));
61
+ InspectTokensController = InspectTokensController_1 = ( __decorate([( __param(1, IStandaloneThemeService)), ( __param(2, ILanguageService))], InspectTokensController));
61
62
  class InspectTokens extends EditorAction {
62
63
  constructor() {
63
64
  super({
64
- id: 'editor.action.inspectTokens',
65
+ id: "editor.action.inspectTokens",
65
66
  label: InspectTokensNLS.inspectTokensAction,
66
- alias: 'Developer: Inspect Tokens',
67
+ alias: "Developer: Inspect Tokens",
67
68
  precondition: undefined
68
69
  });
69
70
  }
@@ -73,18 +74,18 @@ class InspectTokens extends EditorAction {
73
74
  }
74
75
  }
75
76
  function renderTokenText(tokenText) {
76
- let result = '';
77
+ let result = "";
77
78
  for (let charIndex = 0, len = tokenText.length; charIndex < len; charIndex++) {
78
79
  const charCode = tokenText.charCodeAt(charIndex);
79
80
  switch (charCode) {
80
- case CharCode.Tab:
81
- result += '\u2192';
82
- break;
83
- case CharCode.Space:
84
- result += '\u00B7';
85
- break;
86
- default:
87
- result += String.fromCharCode(charCode);
81
+ case CharCode.Tab:
82
+ result += "→";
83
+ break;
84
+ case CharCode.Space:
85
+ result += "·";
86
+ break;
87
+ default:
88
+ result += String.fromCharCode(charCode);
88
89
  }
89
90
  }
90
91
  return result;
@@ -102,18 +103,22 @@ function getSafeTokenizationSupport(languageIdCodec, languageId) {
102
103
  };
103
104
  }
104
105
  class InspectTokensWidget extends Disposable {
105
- static { this._ID = 'editor.contrib.inspectTokensWidget'; }
106
+ static {
107
+ this._ID = "editor.contrib.inspectTokensWidget";
108
+ }
106
109
  constructor(editor, languageService) {
107
110
  super();
108
111
  this.allowEditorOverflow = true;
109
112
  this._editor = editor;
110
113
  this._languageService = languageService;
111
114
  this._model = this._editor.getModel();
112
- this._domNode = createElement('div');
113
- this._domNode.className = 'tokens-inspect-widget';
115
+ this._domNode = createElement("div");
116
+ this._domNode.className = "tokens-inspect-widget";
114
117
  this._tokenizationSupport = getSafeTokenizationSupport(this._languageService.languageIdCodec, this._model.getLanguageId());
115
118
  this._compute(this._editor.getPosition());
116
- this._register(this._editor.onDidChangeCursorPosition((e) => this._compute(this._editor.getPosition())));
119
+ this._register(
120
+ this._editor.onDidChangeCursorPosition(e => this._compute(this._editor.getPosition()))
121
+ );
117
122
  this._editor.addContentWidget(this);
118
123
  }
119
124
  dispose() {
@@ -141,19 +146,56 @@ class InspectTokensWidget extends Disposable {
141
146
  }
142
147
  }
143
148
  const lineContent = this._model.getLineContent(position.lineNumber);
144
- let tokenText = '';
149
+ let tokenText = "";
145
150
  if (token1Index < data.tokens1.length) {
146
151
  const tokenStartIndex = data.tokens1[token1Index].offset;
147
152
  const tokenEndIndex = token1Index + 1 < data.tokens1.length ? data.tokens1[token1Index + 1].offset : lineContent.length;
148
153
  tokenText = lineContent.substring(tokenStartIndex, tokenEndIndex);
149
154
  }
150
- reset(this._domNode, $('h2.tm-token', undefined, renderTokenText(tokenText), $('span.tm-token-length', undefined, `${tokenText.length} ${tokenText.length === 1 ? 'char' : 'chars'}`)));
151
- append(this._domNode, $('hr.tokens-inspect-separator', { 'style': 'clear:both' }));
155
+ reset(this._domNode, $("h2.tm-token", undefined, renderTokenText(tokenText), $(
156
+ "span.tm-token-length",
157
+ undefined,
158
+ `${tokenText.length} ${tokenText.length === 1 ? "char" : "chars"}`
159
+ )));
160
+ append(this._domNode, $("hr.tokens-inspect-separator", {
161
+ "style": "clear:both"
162
+ }));
152
163
  const metadata = (token2Index << 1) + 1 < data.tokens2.length ? this._decodeMetadata(data.tokens2[(token2Index << 1) + 1]) : null;
153
- append(this._domNode, $('table.tm-metadata-table', undefined, $('tbody', undefined, $('tr', undefined, $('td.tm-metadata-key', undefined, 'language'), $('td.tm-metadata-value', undefined, `${metadata ? metadata.languageId : '-?-'}`)), $('tr', undefined, $('td.tm-metadata-key', undefined, 'token type'), $('td.tm-metadata-value', undefined, `${metadata ? this._tokenTypeToString(metadata.tokenType) : '-?-'}`)), $('tr', undefined, $('td.tm-metadata-key', undefined, 'font style'), $('td.tm-metadata-value', undefined, `${metadata ? this._fontStyleToString(metadata.fontStyle) : '-?-'}`)), $('tr', undefined, $('td.tm-metadata-key', undefined, 'foreground'), $('td.tm-metadata-value', undefined, `${metadata ? Color.Format.CSS.formatHex(metadata.foreground) : '-?-'}`)), $('tr', undefined, $('td.tm-metadata-key', undefined, 'background'), $('td.tm-metadata-value', undefined, `${metadata ? Color.Format.CSS.formatHex(metadata.background) : '-?-'}`)))));
154
- append(this._domNode, $('hr.tokens-inspect-separator'));
164
+ append(this._domNode, $("table.tm-metadata-table", undefined, $(
165
+ "tbody",
166
+ undefined,
167
+ $("tr", undefined, $("td.tm-metadata-key", undefined, "language"), $(
168
+ "td.tm-metadata-value",
169
+ undefined,
170
+ `${metadata ? metadata.languageId : "-?-"}`
171
+ )),
172
+ $("tr", undefined, $("td.tm-metadata-key", undefined, "token type"), $(
173
+ "td.tm-metadata-value",
174
+ undefined,
175
+ `${metadata ? this._tokenTypeToString(metadata.tokenType) : "-?-"}`
176
+ )),
177
+ $("tr", undefined, $("td.tm-metadata-key", undefined, "font style"), $(
178
+ "td.tm-metadata-value",
179
+ undefined,
180
+ `${metadata ? this._fontStyleToString(metadata.fontStyle) : "-?-"}`
181
+ )),
182
+ $("tr", undefined, $("td.tm-metadata-key", undefined, "foreground"), $(
183
+ "td.tm-metadata-value",
184
+ undefined,
185
+ `${metadata ? Color.Format.CSS.formatHex(metadata.foreground) : "-?-"}`
186
+ )),
187
+ $("tr", undefined, $("td.tm-metadata-key", undefined, "background"), $(
188
+ "td.tm-metadata-value",
189
+ undefined,
190
+ `${metadata ? Color.Format.CSS.formatHex(metadata.background) : "-?-"}`
191
+ ))
192
+ )));
193
+ append(this._domNode, $("hr.tokens-inspect-separator"));
155
194
  if (token1Index < data.tokens1.length) {
156
- append(this._domNode, $('span.tm-token-type', undefined, data.tokens1[token1Index].type));
195
+ append(
196
+ this._domNode,
197
+ $("span.tm-token-type", undefined, data.tokens1[token1Index].type)
198
+ );
157
199
  }
158
200
  this._editor.layoutContentWidget(this);
159
201
  }
@@ -174,29 +216,34 @@ class InspectTokensWidget extends Disposable {
174
216
  }
175
217
  _tokenTypeToString(tokenType) {
176
218
  switch (tokenType) {
177
- case StandardTokenType.Other: return 'Other';
178
- case StandardTokenType.Comment: return 'Comment';
179
- case StandardTokenType.String: return 'String';
180
- case StandardTokenType.RegEx: return 'RegEx';
181
- default: return '??';
219
+ case StandardTokenType.Other:
220
+ return "Other";
221
+ case StandardTokenType.Comment:
222
+ return "Comment";
223
+ case StandardTokenType.String:
224
+ return "String";
225
+ case StandardTokenType.RegEx:
226
+ return "RegEx";
227
+ default:
228
+ return "??";
182
229
  }
183
230
  }
184
231
  _fontStyleToString(fontStyle) {
185
- let r = '';
232
+ let r = "";
186
233
  if (fontStyle & FontStyle.Italic) {
187
- r += 'italic ';
234
+ r += "italic ";
188
235
  }
189
236
  if (fontStyle & FontStyle.Bold) {
190
- r += 'bold ';
237
+ r += "bold ";
191
238
  }
192
239
  if (fontStyle & FontStyle.Underline) {
193
- r += 'underline ';
240
+ r += "underline ";
194
241
  }
195
242
  if (fontStyle & FontStyle.Strikethrough) {
196
- r += 'strikethrough ';
243
+ r += "strikethrough ";
197
244
  }
198
245
  if (r.length === 0) {
199
- r = '---';
246
+ r = "---";
200
247
  }
201
248
  return r;
202
249
  }
@@ -225,9 +272,16 @@ class InspectTokensWidget extends Disposable {
225
272
  getPosition() {
226
273
  return {
227
274
  position: this._editor.getPosition(),
228
- preference: [ContentWidgetPositionPreference.BELOW, ContentWidgetPositionPreference.ABOVE]
275
+ preference: [
276
+ ContentWidgetPositionPreference.BELOW,
277
+ ContentWidgetPositionPreference.ABOVE
278
+ ]
229
279
  };
230
280
  }
231
281
  }
232
- registerEditorContribution(InspectTokensController.ID, InspectTokensController, EditorContributionInstantiation.Lazy);
282
+ registerEditorContribution(
283
+ InspectTokensController.ID,
284
+ InspectTokensController,
285
+ EditorContributionInstantiation.Lazy
286
+ );
233
287
  registerEditorAction(InspectTokens);