@theia/monaco 1.34.0 → 1.35.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 (17) hide show
  1. package/lib/browser/monaco-bulk-edit-service.js +1 -1
  2. package/lib/browser/monaco-bulk-edit-service.js.map +1 -1
  3. package/lib/browser/monaco-workspace.d.ts +5 -3
  4. package/lib/browser/monaco-workspace.d.ts.map +1 -1
  5. package/lib/browser/monaco-workspace.js +16 -1
  6. package/lib/browser/monaco-workspace.js.map +1 -1
  7. package/lib/browser/textmate/monaco-textmate-frontend-bindings.d.ts.map +1 -1
  8. package/lib/browser/textmate/monaco-textmate-frontend-bindings.js.map +1 -1
  9. package/lib/browser/textmate/textmate-tokenizer.d.ts +3 -3
  10. package/lib/browser/textmate/textmate-tokenizer.d.ts.map +1 -1
  11. package/lib/browser/textmate/textmate-tokenizer.js +8 -8
  12. package/lib/browser/textmate/textmate-tokenizer.js.map +1 -1
  13. package/package.json +8 -8
  14. package/src/browser/monaco-bulk-edit-service.ts +1 -1
  15. package/src/browser/monaco-workspace.ts +21 -2
  16. package/src/browser/textmate/monaco-textmate-frontend-bindings.ts +1 -2
  17. package/src/browser/textmate/textmate-tokenizer.ts +8 -8
package/lib/browser/monaco-bulk-edit-service.js CHANGED
@@ -36,7 +36,7 @@ let MonacoBulkEditService = class MonacoBulkEditService {
36
36
  return { ariaSummary: '', success: true };
37
37
  }
38
38
  else {
39
- return this.workspace.applyBulkEdit(edits);
39
+ return this.workspace.applyBulkEdit(edits, options);
40
40
  }
41
41
  }
42
42
  hasPreviewHandler() {
package/lib/browser/monaco-bulk-edit-service.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-bulk-edit-service.js","sourceRoot":"","sources":["../../src/browser/monaco-bulk-edit-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,yDAAqD;AACrD,8GAEkF;AAKlF,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAQ9B,KAAK,CAAC,KAAK,CAAC,OAAuC,EAAE,OAA0B;QAC3E,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,8BAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE/E,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,KAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,WAAC,OAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,iBAAiB,CAAA,EAAA,CAAC,CAAC,EAAE;YAC1G,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACrD,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC7C;aAAM;YACH,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SAC9C;IACL,CAAC;IAED,iBAAiB;QACb,OAAO,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,CAAC;IAED,iBAAiB,CAAC,OAAgC;QAC9C,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;QAE/B,MAAM,qBAAqB,GAAG,GAAG,EAAE;YAC/B,IAAI,IAAI,CAAC,eAAe,KAAK,OAAO,EAAE;gBAClC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;aACpC;QACL,CAAC,CAAC;QAEF,OAAO;YACH,OAAO;gBACH,qBAAqB,EAAE,CAAC;YAC5B,CAAC;SACJ,CAAC;IACN,CAAC;CACJ,CAAA;AAlCG;IADC,IAAA,kBAAM,EAAC,kCAAe,CAAC;8BACM,kCAAe;wDAAC;AAJrC,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAsCjC;AAtCY,sDAAqB"}
1
+ {"version":3,"file":"monaco-bulk-edit-service.js","sourceRoot":"","sources":["../../src/browser/monaco-bulk-edit-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAkE;AAClE,yDAAqD;AACrD,8GAEkF;AAKlF,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAQ9B,KAAK,CAAC,KAAK,CAAC,OAAuC,EAAE,OAA0B;QAC3E,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,8BAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAE/E,IAAI,IAAI,CAAC,eAAe,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,KAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,WAAC,OAAA,MAAA,KAAK,CAAC,QAAQ,0CAAE,iBAAiB,CAAA,EAAA,CAAC,CAAC,EAAE;YAC1G,OAAO,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YACrD,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SAC7C;aAAM;YACH,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;SACvD;IACL,CAAC;IAED,iBAAiB;QACb,OAAO,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACzC,CAAC;IAED,iBAAiB,CAAC,OAAgC;QAC9C,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC;QAE/B,MAAM,qBAAqB,GAAG,GAAG,EAAE;YAC/B,IAAI,IAAI,CAAC,eAAe,KAAK,OAAO,EAAE;gBAClC,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;aACpC;QACL,CAAC,CAAC;QAEF,OAAO;YACH,OAAO;gBACH,qBAAqB,EAAE,CAAC;YAC5B,CAAC;SACJ,CAAC;IACN,CAAC;CACJ,CAAA;AAlCG;IADC,IAAA,kBAAM,EAAC,kCAAe,CAAC;8BACM,kCAAe;wDAAC;AAJrC,qBAAqB;IADjC,IAAA,sBAAU,GAAE;GACA,qBAAqB,CAsCjC;AAtCY,sDAAqB"}
package/lib/browser/monaco-workspace.d.ts CHANGED
@@ -1,13 +1,13 @@
1
1
  import { URI as Uri } from '@theia/core/shared/vscode-uri';
2
2
  import { Emitter } from '@theia/core/lib/common/event';
3
3
  import { FileSystemPreferences } from '@theia/filesystem/lib/browser';
4
- import { EditorManager } from '@theia/editor/lib/browser';
4
+ import { EditorManager, EditorPreferences } from '@theia/editor/lib/browser';
5
5
  import { MonacoTextModelService } from './monaco-text-model-service';
6
6
  import { WillSaveMonacoModelEvent, MonacoEditorModel, MonacoModelContentChangedEvent } from './monaco-editor-model';
7
7
  import { ProblemManager } from '@theia/markers/lib/browser';
8
8
  import { FileService } from '@theia/filesystem/lib/browser/file-service';
9
9
  import * as monaco from '@theia/monaco-editor-core';
10
- import { IBulkEditResult, ResourceEdit, ResourceFileEdit as MonacoResourceFileEdit, ResourceTextEdit as MonacoResourceTextEdit } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
10
+ import { IBulkEditOptions, IBulkEditResult, ResourceEdit, ResourceFileEdit as MonacoResourceFileEdit, ResourceTextEdit as MonacoResourceTextEdit } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
11
11
  import { TextEdit } from '@theia/monaco-editor-core/esm/vs/editor/common/languages';
12
12
  import { MaybePromise } from '@theia/core/lib/common';
13
13
  export declare namespace WorkspaceFileEdit {
@@ -47,6 +47,7 @@ export declare class MonacoWorkspace {
47
47
  readonly onDidSaveTextDocument: import("@theia/core/lib/common").Event<MonacoEditorModel>;
48
48
  protected readonly fileService: FileService;
49
49
  protected readonly filePreferences: FileSystemPreferences;
50
+ protected readonly editorPreferences: EditorPreferences;
50
51
  protected readonly textModelService: MonacoTextModelService;
51
52
  protected readonly editorManager: EditorManager;
52
53
  protected readonly problems: ProblemManager;
@@ -67,9 +68,10 @@ export declare class MonacoWorkspace {
67
68
  * The model is saved if no editors is opened for it.
68
69
  */
69
70
  applyBackgroundEdit(model: MonacoEditorModel, editOperations: monaco.editor.IIdentifiedSingleEditOperation[], shouldSave?: boolean): Promise<void>;
70
- applyBulkEdit(edits: ResourceEdit[]): Promise<IBulkEditResult & {
71
+ applyBulkEdit(edits: ResourceEdit[], options?: IBulkEditOptions): Promise<IBulkEditResult & {
71
72
  success: boolean;
72
73
  }>;
74
+ protected saveAll(resources: Set<string>): Promise<void>;
73
75
  protected getAriaSummary(totalEdits: number, totalFiles: number): string;
74
76
  protected performTextEdits(edits: MonacoResourceTextEdit[]): Promise<{
75
77
  totalEdits: number;
package/lib/browser/monaco-workspace.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-workspace.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-workspace.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monaco-workspace.d.ts","sourceRoot":"","sources":["../../src/browser/monaco-workspace.ts"],"names":[],"mappings":"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"}
package/lib/browser/monaco-workspace.js CHANGED
@@ -177,7 +177,7 @@ let MonacoWorkspace = class MonacoWorkspace {
177
177
  }
178
178
  });
179
179
  }
180
- async applyBulkEdit(edits) {
180
+ async applyBulkEdit(edits, options) {
181
181
  try {
182
182
  let totalEdits = 0;
183
183
  let totalFiles = 0;
@@ -194,6 +194,14 @@ let MonacoWorkspace = class MonacoWorkspace {
194
194
  if (snippetEdits.length > 0) {
195
195
  await this.performSnippetEdits(snippetEdits);
196
196
  }
197
+ // when enabled (option AND setting) loop over all dirty working copies and trigger save
198
+ // for those that were involved in this bulk edit operation.
199
+ const resources = new Set(edits
200
+ .filter((edit) => edit instanceof bulkEditService_1.ResourceTextEdit)
201
+ .map(edit => edit.resource.toString()));
202
+ if (resources.size > 0 && (options === null || options === void 0 ? void 0 : options.respectAutoSaveConfig) && this.editorPreferences.get('files.refactoring.autoSave') === true) {
203
+ await this.saveAll(resources);
204
+ }
197
205
  const ariaSummary = this.getAriaSummary(totalEdits, totalFiles);
198
206
  return { ariaSummary, success: true };
199
207
  }
@@ -205,6 +213,9 @@ let MonacoWorkspace = class MonacoWorkspace {
205
213
  };
206
214
  }
207
215
  }
216
+ async saveAll(resources) {
217
+ await Promise.all(Array.from(resources.values()).map(uri => { var _a; return (_a = this.textModelService.get(uri)) === null || _a === void 0 ? void 0 : _a.save(); }));
218
+ }
208
219
  getAriaSummary(totalEdits, totalFiles) {
209
220
  if (totalEdits === 0) {
210
221
  return 'Made no edits';
@@ -345,6 +356,10 @@ __decorate([
345
356
  (0, inversify_1.inject)(browser_1.FileSystemPreferences),
346
357
  __metadata("design:type", Object)
347
358
  ], MonacoWorkspace.prototype, "filePreferences", void 0);
359
+ __decorate([
360
+ (0, inversify_1.inject)(browser_2.EditorPreferences),
361
+ __metadata("design:type", Object)
362
+ ], MonacoWorkspace.prototype, "editorPreferences", void 0);
348
363
  __decorate([
349
364
  (0, inversify_1.inject)(monaco_text_model_service_1.MonacoTextModelService),
350
365
  __metadata("design:type", monaco_text_model_service_1.MonacoTextModelService)
package/lib/browser/monaco-workspace.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-workspace.js","sourceRoot":"","sources":["../../src/browser/monaco-workspace.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monaco-workspace.js","sourceRoot":"","sources":["../../src/browser/monaco-workspace.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAKhF,4DAAiF;AACjF,oDAA6C;AAC7C,wDAAuD;AACvD,2DAAsE;AACtE,uDAA6E;AAC7E,2EAAqE;AAErE,mDAA+C;AAC/C,wDAA4D;AAC5D,wDAA0D;AAC1D,6EAAyE;AAEzE,oDAAoD;AACpD,8GAIkF;AAClF,uGAA4G;AAC5G,sHAAmH;AAEnH,iHAA8G;AAG9G,mDAAgE;AAEhE,IAAiB,iBAAiB,CAKjC;AALD,WAAiB,iBAAiB;IAC9B,SAAgB,EAAE,CAAC,GAAS;QACxB,OAAO,CAAC,aAAa,IAAI,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC9D,CAAC,aAAa,IAAI,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IACpE,CAAC;IAHe,oBAAE,KAGjB,CAAA;AACL,CAAC,EALgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAKjC;AAED,IAAiB,iBAAiB,CAMjC;AAND,WAAiB,iBAAiB;IAC9B,SAAgB,EAAE,CAAC,GAAS;QACxB,OAAO,IAAA,iBAAQ,EAAsC,GAAG,CAAC;eAClD,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC;eAC9B,IAAA,iBAAQ,EAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC;IAJe,oBAAE,KAIjB,CAAA;AACL,CAAC,EANgB,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAMjC;AAID,IAAiB,gBAAgB,CAIhC;AAJD,WAAiB,gBAAgB;IAC7B,SAAgB,EAAE,CAAC,GAAiB;QAChC,OAAO,IAAA,iBAAQ,EAAyB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IAC7H,CAAC;IAFe,mBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAIhC;AAED,IAAiB,gBAAgB,CAIhC;AAJD,WAAiB,gBAAgB;IAC7B,SAAgB,EAAE,CAAC,GAAiB;QAChC,OAAO,CAAC,UAAU,IAAI,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC,KAAK,CAAE,GAA8B,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC7F,CAAC;IAFe,mBAAE,KAEjB,CAAA;AACL,CAAC,EAJgB,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAIhC;AAcD,IAAa,eAAe,GAA5B,MAAa,eAAe;IAA5B;QAGa,UAAK,GAAG,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;YACzC,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;QAChC,CAAC,CAAC,CAAC;QAEgB,iCAA4B,GAAG,IAAI,eAAO,EAAqB,CAAC;QAC1E,0BAAqB,GAAG,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC;QAEtD,kCAA6B,GAAG,IAAI,eAAO,EAAqB,CAAC;QAC3E,2BAAsB,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC;QAExD,mCAA8B,GAAG,IAAI,eAAO,EAAkC,CAAC;QACzF,4BAAuB,GAAG,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC;QAE1D,kCAA6B,GAAG,IAAI,eAAO,EAA4B,CAAC;QAClF,2BAAsB,GAAG,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC;QAExD,iCAA4B,GAAG,IAAI,eAAO,EAAqB,CAAC;QAC1E,0BAAqB,GAAG,IAAI,CAAC,4BAA4B,CAAC,KAAK,CAAC;QA6EtD,0BAAqB,GAAwB,EAAE,CAAC;IAoOvE,CAAC;IA5Ra,IAAI;QACV,IAAI,CAAC,YAAY,EAAE,CAAC;QAEpB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE;YAC9C,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC3B;QACD,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACxE,CAAC;IAED,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;IACxC,CAAC;IAED,eAAe,CAAC,GAAW;QACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC1C,CAAC;IAES,WAAW,CAAC,KAAwB;QAC1C,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC1B,KAAK,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC,CAAC,EAAE;YAC1C,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAClD,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;YACnC,IAAI;gBACA,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;aAC5B;oBAAS;gBACN,KAAK,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;aAClC;YACD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC;QACpE,KAAK,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC;QACpD,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;QACzD,KAAK,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1D,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;IACpD,CAAC;IAES,aAAa,CAAC,KAAwB;QAC5C,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IAES,YAAY,CAAC,KAAwB;QAC3C,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;IAES,oBAAoB,CAAC,KAAqC;QAChE,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAES,YAAY,CAAC,KAA+B;QAClD,IAAI,CAAC,6BAA6B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC;IAES,WAAW,CAAC,KAAwB;QAC1C,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,CAAC;IAIS,iBAAiB,CAAC,KAAwB;QAChD,IAAI,KAAK,CAAC,2BAA2B,IAAI,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;YACvF,OAAO;SACV;QACD,IAAI,KAAK,CAAC,KAAK,IAAI,4BAAY,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;YACpF,6EAA6E;YAC7E,sEAAsE;YACtE,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;gBAC7E,CACI,KAAK,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBAC9E,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CACpE,CAAC,IAAI,CACF,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,EAAE,CACtB,CAAC;YACN,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,KAAwB,EAAE,EAA4B;QACtF,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvC,IAAI;YACA,MAAM,EAAE,EAAE,CAAC;SACd;gBAAS;YACN,MAAM,CAAC,GAAG,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;gBACV,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aAC3C;SACJ;IACL,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,KAAwB,EAAE,cAA8D,EAAE,UAAU,GAAG,IAAI;QAC3H,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,IAAI,EAAE;YAC9C,MAAM,MAAM,GAAG,4BAAY,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACzE,MAAM,WAAW,GAAG,MAAM,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC,aAAa,EAAE,IAAI,EAAE,CAAC;YACxE,KAAK,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;YACzC,KAAK,CAAC,eAAe,CAAC,kBAAkB,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;YACzF,KAAK,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;YACzC,IAAI,CAAC,MAAM,IAAI,UAAU,EAAE;gBACvB,MAAM,KAAK,CAAC,IAAI,EAAE,CAAC;aACtB;QACL,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAqB,EAAE,OAA0B;QACjE,IAAI;YACA,IAAI,UAAU,GAAG,CAAC,CAAC;YACnB,IAAI,UAAU,GAAG,CAAC,CAAC;YACnB,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,YAAY,kCAAsB,CAAC,CAAC;YAC/E,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,GAAG,kBAAU,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,YAAY,kCAAsB,CAA6B,EAC3I,IAAI,CAAC,EAAE,eAAC,OAAA,IAAI,CAAC,QAAQ,CAAC,eAAe,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAK,MAAA,MAAA,IAAI,CAAC,aAAa,CAAC,YAAY,0CAAE,cAAc,EAAE,0CAAE,QAAQ,EAAE,CAAA,CAAC,CAAA,EAAA,CAAC,CAAC;YAE3I,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtB,MAAM,IAAI,CAAC,gBAAgB,CAA2B,SAAS,CAAC,CAAC;aACpE;YAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAA2B,SAAS,CAAC,CAAC;gBAChF,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC;gBAChC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC;aACnC;YAED,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,MAAM,IAAI,CAAC,mBAAmB,CAA2B,YAAY,CAAC,CAAC;aAC1E;YAED,wFAAwF;YACxF,4DAA4D;YAC5D,MAAM,SAAS,GAAG,IAAI,GAAG,CACrB,KAAK;iBACA,MAAM,CAAC,CAAC,IAAI,EAAkC,EAAE,CAAC,IAAI,YAAY,kCAAsB,CAAC;iBACxF,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAC7C,CAAC;YACF,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,qBAAqB,CAAA,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,4BAA4B,CAAC,KAAK,IAAI,EAAE;gBAC3H,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;aACjC;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;YAChE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SACzC;QAAC,OAAO,CAAC,EAAE;YACR,OAAO,CAAC,KAAK,CAAC,iCAAiC,EAAE,CAAC,CAAC,CAAC;YACpD,OAAO;gBACH,WAAW,EAAE,kCAAkC,CAAC,CAAC,QAAQ,EAAE,EAAE;gBAC7D,OAAO,EAAE,KAAK;aACjB,CAAC;SACL;IACL,CAAC;IAES,KAAK,CAAC,OAAO,CAAC,SAAsB;QAC1C,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,0CAAE,IAAI,EAAE,CAAA,EAAA,CAAC,CAAC,CAAC;IACzG,CAAC;IAES,cAAc,CAAC,UAAkB,EAAE,UAAkB;QAC3D,IAAI,UAAU,KAAK,CAAC,EAAE;YAClB,OAAO,eAAe,CAAC;SAC1B;QACD,IAAI,UAAU,GAAG,CAAC,IAAI,UAAU,GAAG,CAAC,EAAE;YAClC,OAAO,QAAQ,UAAU,kBAAkB,UAAU,QAAQ,CAAC;SACjE;QACD,OAAO,QAAQ,UAAU,yBAAyB,CAAC;IACvD,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,KAA+B;QAI5D,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,IAAI,UAAU,GAAG,CAAC,CAAC;QACnB,MAAM,aAAa,GAAG,IAAI,GAAG,EAAoC,CAAC;QAClE,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,IAAI,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ,EAAE;gBACpC,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAClE,IAAI,KAAK,IAAI,KAAK,CAAC,eAAe,CAAC,YAAY,EAAE,KAAK,IAAI,CAAC,SAAS,EAAE;oBAClE,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,CAAC,GAAG,8BAA8B,CAAC,CAAC;iBAC/D;aACJ;YACD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACrC,IAAI,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,CAAC,KAAK,EAAE;gBACR,KAAK,GAAG,EAAE,CAAC;gBACX,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aACjC;YACD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACpB;QACD,MAAM,OAAO,GAAoB,EAAE,CAAC;QACpC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,aAAa,EAAE;YACtC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE;;gBACrB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAClC,IAAI,GAAkC,CAAC;gBACvC,MAAM,cAAc,GAAmD,EAAE,CAAC;gBAC1E,MAAM,YAAY,GAAG,MAAM,uCAAkB,CAAC,GAAG,CAAC,mCAAoB,CAAC;qBAClE,uBAAuB,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,kCAAkC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACpG,IAAI,YAAY,EAAE;oBACd,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE;wBACjC,IAAI,OAAO,QAAQ,CAAC,GAAG,KAAK,QAAQ,EAAE;4BAClC,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC;yBACtB;wBACD,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE;4BACxD,aAAa;4BACb,SAAS;yBACZ;wBACD,cAAc,CAAC,IAAI,CAAC;4BAChB,gBAAgB,EAAE,KAAK;4BACvB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;4BACxC,IAAI,EAAE,QAAQ,CAAC,IAAI;yBACtB,CAAC,CAAC;qBACN;iBACJ;gBACD,IAAI,CAAC,cAAc,CAAC,MAAM,IAAI,GAAG,KAAK,SAAS,EAAE;oBAC7C,OAAO;iBACV;gBACD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;gBACxE,IAAI;oBACA,MAAM,QAAQ,GAAG,SAAS,CAAC,MAA2B,CAAC;oBACvD,MAAM,KAAK,GAAG,QAAQ,CAAC,eAAe,CAAC;oBACvC,MAAM,MAAM,GAAG,4BAAY,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC5E,MAAM,WAAW,GAAG,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,UAAU,GAAG,aAAa,EAAE,mCAAI,EAAE,CAAC;oBAC/D,0BAA0B;oBAC1B,KAAK,CAAC,gBAAgB,EAAE,CAAC;oBACzB,IAAI,cAAc,CAAC,MAAM,EAAE;wBACvB,KAAK,CAAC,kBAAkB,CAAC,WAAW,EAAE,cAAc,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC;qBAC5E;oBACD,IAAI,GAAG,KAAK,SAAS,EAAE;wBACnB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;qBACtB;oBACD,uDAAuD;oBACvD,KAAK,CAAC,gBAAgB,EAAE,CAAC;oBACzB,UAAU,IAAI,CAAC,CAAC;oBAChB,UAAU,IAAI,cAAc,CAAC,MAAM,CAAC;iBACvC;wBAAS;oBACN,SAAS,CAAC,OAAO,EAAE,CAAC;iBACvB;YACL,CAAC,CAAC,EAAE,CAAC,CAAC;SACT;QACD,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IACtC,CAAC;IAES,KAAK,CAAC,gBAAgB,CAAC,KAA+B;QAC5D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;YACtB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;YACnC,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE;gBACtC,SAAS;gBACT,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,OAAO,CAAC,cAAc,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE;oBACvH,OAAO,CAAC,4DAA4D;iBACvE;gBACD,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;aACvH;iBAAM,IAAI,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,EAAE;gBAC9C,cAAc;gBACd,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE;oBAC1D,IAAI,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;oBACzD,IAAI,QAAQ,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,IAAI,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,mBAAuC,CAAC,EAAE;wBAChH,QAAQ,GAAG,KAAK,CAAC,CAAC,4BAA4B;qBACjD;oBACD,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;iBACxG;qBAAM,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;oBACnC,MAAM,IAAI,KAAK,CAAC,GAAG,IAAI,CAAC,WAAW,wCAAwC,CAAC,CAAC;iBAChF;aACJ;iBAAM,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;gBAC9C,cAAc;gBACd,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,OAAO,CAAC,cAAc,IAAI,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,EAAE;oBACvH,OAAO,CAAC,4DAA4D;iBACvE;gBACD,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,aAAG,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC;aACzG;SACJ;IACL,CAAC;IAES,KAAK,CAAC,mBAAmB,CAAC,KAA+B;;QAC/D,MAAM,YAAY,GAAG,MAAA,4BAAY,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,0CAAE,UAAU,EAAE,CAAC;QAC9E,IAAI,YAAY,EAAE;YACd,MAAM,iBAAiB,GAAuB,YAAY,CAAC,eAAe,CAAC,oBAAoB,CAAE,CAAC;YAClG,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SACjI;IACL,CAAC;IAES,kCAAkC,CAAC,YAAoC;QAC7E,IAAI,YAAY,CAAC,QAAQ,CAAC,eAAe,EAAE;YACvC,uCAAY,YAAY,CAAC,QAAQ,KAAE,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE,6BAAa,CAAC,YAAY,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAG;SAC7H;aAAM;YACH,OAAO,YAAY,CAAC,QAAQ,CAAC;SAChC;IACL,CAAC;CACJ,CAAA;AA9SG;IADC,IAAA,kBAAM,EAAC,0BAAW,CAAC;8BACY,0BAAW;oDAAC;AAG5C;IADC,IAAA,kBAAM,EAAC,+BAAqB,CAAC;;wDAC4B;AAG1D;IADC,IAAA,kBAAM,EAAC,2BAAiB,CAAC;;0DAC8B;AAGxD;IADC,IAAA,kBAAM,EAAC,kDAAsB,CAAC;8BACM,kDAAsB;yDAAC;AAG5D;IADC,IAAA,kBAAM,EAAC,uBAAa,CAAC;8BACY,uBAAa;sDAAC;AAGhD;IADC,IAAA,kBAAM,EAAC,wBAAc,CAAC;8BACM,wBAAc;iDAAC;AAG5C;IADC,IAAA,yBAAa,GAAE;;;;2CAQf;AAhDQ,eAAe;IAD3B,IAAA,sBAAU,GAAE;GACA,eAAe,CAqU3B;AArUY,0CAAe"}
package/lib/browser/textmate/monaco-textmate-frontend-bindings.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-textmate-frontend-bindings.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-frontend-bindings.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAO1D,OAAO,EAA+B,WAAW,EAAoB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC1G,OAAO,EAAE,QAAQ,EAA6B,MAAM,iBAAiB,CAAC;AAItE,qBAAa,UAAW,YAAW,QAAQ;IACvC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW;IAGjD,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU;CAGhD;+BAEqB,WAAW,IAAI,UAAU,WAAW,MAAM,WAAW,WAAW,OAAO,UAAU,WAAW,MAAM;AAAxH,wBAoCE;AAEF,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAElF;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,QAAQ,CAAC,CAO1D;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,CAKzD"}
1
+ {"version":3,"file":"monaco-textmate-frontend-bindings.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-frontend-bindings.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAO1D,OAAO,EAA+B,WAAW,EAAoB,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC1G,OAAO,EAAE,QAAQ,EAA0C,MAAM,iBAAiB,CAAC;AAGnF,qBAAa,UAAW,YAAW,QAAQ;IACvC,iBAAiB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,WAAW;IAGjD,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,UAAU;CAGhD;+BAEqB,WAAW,IAAI,UAAU,WAAW,MAAM,WAAW,WAAW,OAAO,UAAU,WAAW,MAAM;AAAxH,wBAoCE;AAEF,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAElF;AAED,wBAAsB,gBAAgB,IAAI,OAAO,CAAC,QAAQ,CAAC,CAO1D;AAED,wBAAsB,YAAY,IAAI,OAAO,CAAC,WAAW,CAAC,CAKzD"}
package/lib/browser/textmate/monaco-textmate-frontend-bindings.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"monaco-textmate-frontend-bindings.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-frontend-bindings.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"monaco-textmate-frontend-bindings.js","sourceRoot":"","sources":["../../../src/browser/textmate/monaco-textmate-frontend-bindings.ts"],"names":[],"mappings":"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"}
package/lib/browser/textmate/textmate-tokenizer.d.ts CHANGED
@@ -1,8 +1,8 @@
1
- import { StateStack, IGrammar } from 'vscode-textmate';
1
+ import { IGrammar, StackElement } from 'vscode-textmate';
2
2
  import * as monaco from '@theia/monaco-editor-core';
3
3
  export declare class TokenizerState implements monaco.languages.IState {
4
- readonly ruleStack: StateStack;
5
- constructor(ruleStack: StateStack);
4
+ readonly stackElement: StackElement;
5
+ constructor(stackElement: StackElement);
6
6
  clone(): monaco.languages.IState;
7
7
  equals(other: monaco.languages.IState): boolean;
8
8
  }
package/lib/browser/textmate/textmate-tokenizer.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"textmate-tokenizer.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-tokenizer.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAW,UAAU,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,qBAAa,cAAe,YAAW,MAAM,CAAC,SAAS,CAAC,MAAM;aAGtC,SAAS,EAAE,UAAU;gBAArB,SAAS,EAAE,UAAU;IAGzC,KAAK,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM;IAIhC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,OAAO;CAIlD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAE5B;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CAEtB;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,qBAAqB,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,CAgC7J"}
1
+ {"version":3,"file":"textmate-tokenizer.d.ts","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-tokenizer.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAW,QAAQ,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,qBAAa,cAAe,YAAW,MAAM,CAAC,SAAS,CAAC,MAAM;aAGtC,YAAY,EAAE,YAAY;gBAA1B,YAAY,EAAE,YAAY;IAG9C,KAAK,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM;IAIhC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,OAAO;CAIlD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAE5B;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;CAEtB;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,GAAG,MAAM,CAAC,SAAS,CAAC,qBAAqB,GAAG,MAAM,CAAC,SAAS,CAAC,cAAc,CAgC7J"}
package/lib/browser/textmate/textmate-tokenizer.js CHANGED
@@ -18,14 +18,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.createTextmateTokenizer = exports.TokenizerState = void 0;
19
19
  const vscode_textmate_1 = require("vscode-textmate");
20
20
  class TokenizerState {
21
- constructor(ruleStack) {
22
- this.ruleStack = ruleStack;
21
+ constructor(stackElement) {
22
+ this.stackElement = stackElement;
23
23
  }
24
24
  clone() {
25
- return new TokenizerState(this.ruleStack);
25
+ return new TokenizerState(this.stackElement);
26
26
  }
27
27
  equals(other) {
28
- return other instanceof TokenizerState && (other === this || other.ruleStack === this.ruleStack);
28
+ return other instanceof TokenizerState && (other === this || other.stackElement === this.stackElement);
29
29
  }
30
30
  }
31
31
  exports.TokenizerState = TokenizerState;
@@ -38,9 +38,9 @@ function createTextmateTokenizer(grammar, options) {
38
38
  tokenizeEncoded(line, state) {
39
39
  if (options.lineLimit !== undefined && line.length > options.lineLimit) {
40
40
  // Skip tokenizing the line if it exceeds the line limit.
41
- return { endState: state.ruleStack, tokens: new Uint32Array() };
41
+ return { endState: state.stackElement, tokens: new Uint32Array() };
42
42
  }
43
- const result = grammar.tokenizeLine2(line, state.ruleStack, 500);
43
+ const result = grammar.tokenizeLine2(line, state.stackElement, 500);
44
44
  return {
45
45
  endState: new TokenizerState(result.ruleStack),
46
46
  tokens: result.tokens
@@ -49,9 +49,9 @@ function createTextmateTokenizer(grammar, options) {
49
49
  tokenize(line, state) {
50
50
  if (options.lineLimit !== undefined && line.length > options.lineLimit) {
51
51
  // Skip tokenizing the line if it exceeds the line limit.
52
- return { endState: state.ruleStack, tokens: [] };
52
+ return { endState: state.stackElement, tokens: [] };
53
53
  }
54
- const result = grammar.tokenizeLine(line, state.ruleStack, 500);
54
+ const result = grammar.tokenizeLine(line, state.stackElement, 500);
55
55
  return {
56
56
  endState: new TokenizerState(result.ruleStack),
57
57
  tokens: result.tokens.map(t => ({
package/lib/browser/textmate/textmate-tokenizer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"textmate-tokenizer.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-tokenizer.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,qDAAgE;AAGhE,MAAa,cAAc;IAEvB,YACoB,SAAqB;QAArB,cAAS,GAAT,SAAS,CAAY;IACrC,CAAC;IAEL,KAAK;QACD,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;IAED,MAAM,CAAC,KAA8B;QACjC,OAAO,KAAK,YAAY,cAAc,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,SAAS,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC;IACrG,CAAC;CAEJ;AAdD,wCAcC;AAkBD,SAAgB,uBAAuB,CAAC,OAAiB,EAAE,OAAwB;IAC/E,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE;QACrG,MAAM,IAAI,KAAK,CAAC,sDAAsD,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC;KAC/F;IACD,OAAO;QACH,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,yBAAO,CAAC;QAClD,eAAe,CAAC,IAAY,EAAE,KAAqB;YAC/C,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE;gBACpE,yDAAyD;gBACzD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,IAAI,WAAW,EAAE,EAAE,CAAC;aACnE;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YACjE,OAAO;gBACH,QAAQ,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM;aACxB,CAAC;QACN,CAAC;QACD,QAAQ,CAAC,IAAY,EAAE,KAAqB;YACxC,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE;gBACpE,yDAAyD;gBACzD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;aACpD;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YAChE,OAAO;gBACH,QAAQ,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC5B,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;iBACvC,CAAC,CAAC;aACN,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC;AAhCD,0DAgCC"}
1
+ {"version":3,"file":"textmate-tokenizer.js","sourceRoot":"","sources":["../../../src/browser/textmate/textmate-tokenizer.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,qDAAkE;AAGlE,MAAa,cAAc;IAEvB,YACoB,YAA0B;QAA1B,iBAAY,GAAZ,YAAY,CAAc;IAC1C,CAAC;IAEL,KAAK;QACD,OAAO,IAAI,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,KAA8B;QACjC,OAAO,KAAK,YAAY,cAAc,IAAI,CAAC,KAAK,KAAK,IAAI,IAAI,KAAK,CAAC,YAAY,KAAK,IAAI,CAAC,YAAY,CAAC,CAAC;IAC3G,CAAC;CAEJ;AAdD,wCAcC;AAkBD,SAAgB,uBAAuB,CAAC,OAAiB,EAAE,OAAwB;IAC/E,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,EAAE;QACrG,MAAM,IAAI,KAAK,CAAC,sDAAsD,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC;KAC/F;IACD,OAAO;QACH,eAAe,EAAE,GAAG,EAAE,CAAC,IAAI,cAAc,CAAC,yBAAO,CAAC;QAClD,eAAe,CAAC,IAAY,EAAE,KAAqB;YAC/C,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE;gBACpE,yDAAyD;gBACzD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,IAAI,WAAW,EAAE,EAAE,CAAC;aACtE;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;YACpE,OAAO;gBACH,QAAQ,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM;aACxB,CAAC;QACN,CAAC;QACD,QAAQ,CAAC,IAAY,EAAE,KAAqB;YACxC,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE;gBACpE,yDAAyD;gBACzD,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,YAAY,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;aACvD;YACD,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;YACnE,OAAO;gBACH,QAAQ,EAAE,IAAI,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBAC5B,UAAU,EAAE,CAAC,CAAC,UAAU;oBACxB,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;iBACvC,CAAC,CAAC;aACN,CAAC;QACN,CAAC;KACJ,CAAC;AACN,CAAC;AAhCD,0DAgCC"}
package/package.json CHANGED
@@ -1,14 +1,14 @@
1
1
  {
2
2
  "name": "@theia/monaco",
3
- "version": "1.34.0",
3
+ "version": "1.35.0",
4
4
  "description": "Theia - Monaco Extension",
5
5
  "dependencies": {
6
- "@theia/core": "1.34.0",
7
- "@theia/editor": "1.34.0",
8
- "@theia/filesystem": "1.34.0",
9
- "@theia/markers": "1.34.0",
6
+ "@theia/core": "1.35.0",
7
+ "@theia/editor": "1.35.0",
8
+ "@theia/filesystem": "1.35.0",
9
+ "@theia/markers": "1.35.0",
10
10
  "@theia/monaco-editor-core": "1.72.3",
11
- "@theia/outline-view": "1.34.0",
11
+ "@theia/outline-view": "1.35.0",
12
12
  "fast-plist": "^0.1.2",
13
13
  "idb": "^4.0.5",
14
14
  "jsonc-parser": "^2.2.0",
@@ -49,10 +49,10 @@
49
49
  "watch": "theiaext watch"
50
50
  },
51
51
  "devDependencies": {
52
- "@theia/ext-scripts": "1.34.0"
52
+ "@theia/ext-scripts": "1.35.0"
53
53
  },
54
54
  "nyc": {
55
55
  "extends": "../../configs/nyc.json"
56
56
  },
57
- "gitHead": "a8c403b103829a1b8b092ce741ef3826804f773b"
57
+ "gitHead": "5b1e4f9b913cf1b0d27acd4bc435cb2570f164d8"
58
58
  }
package/src/browser/monaco-bulk-edit-service.ts CHANGED
@@ -38,7 +38,7 @@ export class MonacoBulkEditService implements IBulkEditService {
38
38
  editsIn = await this._previewHandler(edits, options);
39
39
  return { ariaSummary: '', success: true };
40
40
  } else {
41
- return this.workspace.applyBulkEdit(edits);
41
+ return this.workspace.applyBulkEdit(edits, options);
42
42
  }
43
43
  }
44
44
 
package/src/browser/monaco-workspace.ts CHANGED
@@ -21,7 +21,7 @@ import { injectable, inject, postConstruct } from '@theia/core/shared/inversify'
21
21
  import URI from '@theia/core/lib/common/uri';
22
22
  import { Emitter } from '@theia/core/lib/common/event';
23
23
  import { FileSystemPreferences } from '@theia/filesystem/lib/browser';
24
- import { EditorManager } from '@theia/editor/lib/browser';
24
+ import { EditorManager, EditorPreferences } from '@theia/editor/lib/browser';
25
25
  import { MonacoTextModelService } from './monaco-text-model-service';
26
26
  import { WillSaveMonacoModelEvent, MonacoEditorModel, MonacoModelContentChangedEvent } from './monaco-editor-model';
27
27
  import { MonacoEditor } from './monaco-editor';
@@ -31,6 +31,7 @@ import { FileService } from '@theia/filesystem/lib/browser/file-service';
31
31
  import { FileSystemProviderCapabilities } from '@theia/filesystem/lib/common/files';
32
32
  import * as monaco from '@theia/monaco-editor-core';
33
33
  import {
34
+ IBulkEditOptions,
34
35
  IBulkEditResult, ResourceEdit, ResourceFileEdit as MonacoResourceFileEdit,
35
36
  ResourceTextEdit as MonacoResourceTextEdit
36
37
  } from '@theia/monaco-editor-core/esm/vs/editor/browser/services/bulkEditService';
@@ -111,6 +112,9 @@ export class MonacoWorkspace {
111
112
  @inject(FileSystemPreferences)
112
113
  protected readonly filePreferences: FileSystemPreferences;
113
114
 
115
+ @inject(EditorPreferences)
116
+ protected readonly editorPreferences: EditorPreferences;
117
+
114
118
  @inject(MonacoTextModelService)
115
119
  protected readonly textModelService: MonacoTextModelService;
116
120
 
@@ -226,7 +230,7 @@ export class MonacoWorkspace {
226
230
  });
227
231
  }
228
232
 
229
- async applyBulkEdit(edits: ResourceEdit[]): Promise<IBulkEditResult & { success: boolean }> {
233
+ async applyBulkEdit(edits: ResourceEdit[], options?: IBulkEditOptions): Promise<IBulkEditResult & { success: boolean }> {
230
234
  try {
231
235
  let totalEdits = 0;
232
236
  let totalFiles = 0;
@@ -248,6 +252,17 @@ export class MonacoWorkspace {
248
252
  await this.performSnippetEdits(<MonacoResourceTextEdit[]>snippetEdits);
249
253
  }
250
254
 
255
+ // when enabled (option AND setting) loop over all dirty working copies and trigger save
256
+ // for those that were involved in this bulk edit operation.
257
+ const resources = new Set<string>(
258
+ edits
259
+ .filter((edit): edit is MonacoResourceTextEdit => edit instanceof MonacoResourceTextEdit)
260
+ .map(edit => edit.resource.toString())
261
+ );
262
+ if (resources.size > 0 && options?.respectAutoSaveConfig && this.editorPreferences.get('files.refactoring.autoSave') === true) {
263
+ await this.saveAll(resources);
264
+ }
265
+
251
266
  const ariaSummary = this.getAriaSummary(totalEdits, totalFiles);
252
267
  return { ariaSummary, success: true };
253
268
  } catch (e) {
@@ -259,6 +274,10 @@ export class MonacoWorkspace {
259
274
  }
260
275
  }
261
276
 
277
+ protected async saveAll(resources: Set<string>): Promise<void> {
278
+ await Promise.all(Array.from(resources.values()).map(uri => this.textModelService.get(uri)?.save()));
279
+ }
280
+
262
281
  protected getAriaSummary(totalEdits: number, totalFiles: number): string {
263
282
  if (totalEdits === 0) {
264
283
  return 'Made no edits';
package/src/browser/textmate/monaco-textmate-frontend-bindings.ts CHANGED
@@ -22,8 +22,7 @@ import { LanguageGrammarDefinitionContribution } from './textmate-contribution';
22
22
  import { MonacoTextmateService } from './monaco-textmate-service';
23
23
  import { MonacoThemeRegistry } from './monaco-theme-registry';
24
24
  import { loadWASM, createOnigScanner, OnigScanner, createOnigString, OnigString } from 'vscode-oniguruma';
25
- import { IOnigLib, parseRawGrammar, Registry } from 'vscode-textmate';
26
- import { IRawGrammar } from 'vscode-textmate/release/rawGrammar';
25
+ import { IOnigLib, IRawGrammar, parseRawGrammar, Registry } from 'vscode-textmate';
27
26
  import { OnigasmPromise, TextmateRegistryFactory, ThemeMix } from './monaco-theme-types';
28
27
 
29
28
  export class OnigasmLib implements IOnigLib {
package/src/browser/textmate/textmate-tokenizer.ts CHANGED
@@ -14,21 +14,21 @@
14
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
15
15
  // *****************************************************************************
16
16
 
17
- import { INITIAL, StateStack, IGrammar } from 'vscode-textmate';
17
+ import { INITIAL, IGrammar, StackElement } from 'vscode-textmate';
18
18
  import * as monaco from '@theia/monaco-editor-core';
19
19
 
20
20
  export class TokenizerState implements monaco.languages.IState {
21
21
 
22
22
  constructor(
23
- public readonly ruleStack: StateStack
23
+ public readonly stackElement: StackElement
24
24
  ) { }
25
25
 
26
26
  clone(): monaco.languages.IState {
27
- return new TokenizerState(this.ruleStack);
27
+ return new TokenizerState(this.stackElement);
28
28
  }
29
29
 
30
30
  equals(other: monaco.languages.IState): boolean {
31
- return other instanceof TokenizerState && (other === this || other.ruleStack === this.ruleStack);
31
+ return other instanceof TokenizerState && (other === this || other.stackElement === this.stackElement);
32
32
  }
33
33
 
34
34
  }
@@ -58,9 +58,9 @@ export function createTextmateTokenizer(grammar: IGrammar, options: TokenizerOpt
58
58
  tokenizeEncoded(line: string, state: TokenizerState): monaco.languages.IEncodedLineTokens {
59
59
  if (options.lineLimit !== undefined && line.length > options.lineLimit) {
60
60
  // Skip tokenizing the line if it exceeds the line limit.
61
- return { endState: state.ruleStack, tokens: new Uint32Array() };
61
+ return { endState: state.stackElement, tokens: new Uint32Array() };
62
62
  }
63
- const result = grammar.tokenizeLine2(line, state.ruleStack, 500);
63
+ const result = grammar.tokenizeLine2(line, state.stackElement, 500);
64
64
  return {
65
65
  endState: new TokenizerState(result.ruleStack),
66
66
  tokens: result.tokens
@@ -69,9 +69,9 @@ export function createTextmateTokenizer(grammar: IGrammar, options: TokenizerOpt
69
69
  tokenize(line: string, state: TokenizerState): monaco.languages.ILineTokens {
70
70
  if (options.lineLimit !== undefined && line.length > options.lineLimit) {
71
71
  // Skip tokenizing the line if it exceeds the line limit.
72
- return { endState: state.ruleStack, tokens: [] };
72
+ return { endState: state.stackElement, tokens: [] };
73
73
  }
74
- const result = grammar.tokenizeLine(line, state.ruleStack, 500);
74
+ const result = grammar.tokenizeLine(line, state.stackElement, 500);
75
75
  return {
76
76
  endState: new TokenizerState(result.ruleStack),
77
77
  tokens: result.tokens.map(t => ({