@opensumi/ide-editor 3.4.5-next-1730119322.0 → 3.4.5
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.
- package/lib/browser/breadcrumb/default.js +4 -4
- package/lib/browser/breadcrumb/default.js.map +1 -1
- package/lib/browser/breadcrumb/document-symbol.js +2 -2
- package/lib/browser/breadcrumb/document-symbol.js.map +1 -1
- package/lib/browser/breadcrumb/index.d.ts.map +1 -1
- package/lib/browser/breadcrumb/index.js +2 -2
- package/lib/browser/breadcrumb/index.js.map +1 -1
- package/lib/browser/component.js +2 -2
- package/lib/browser/component.js.map +1 -1
- package/lib/browser/decoration-applier.js +3 -6
- package/lib/browser/decoration-applier.js.map +1 -1
- package/lib/browser/diff/compare.js +4 -4
- package/lib/browser/diff/compare.js.map +1 -1
- package/lib/browser/diff/index.js +4 -4
- package/lib/browser/diff/index.js.map +1 -1
- package/lib/browser/doc-cache/empty-doc-cache.js +2 -2
- package/lib/browser/doc-cache/empty-doc-cache.js.map +1 -1
- package/lib/browser/doc-cache/local-storage-cache.js +2 -2
- package/lib/browser/doc-cache/local-storage-cache.js.map +1 -1
- package/lib/browser/doc-model/editor-document-error.js +1 -1
- package/lib/browser/doc-model/editor-document-error.js.map +1 -1
- package/lib/browser/doc-model/editor-document-model-service.js +3 -6
- package/lib/browser/doc-model/editor-document-model-service.js.map +1 -1
- package/lib/browser/doc-model/editor-document-model.d.ts.map +1 -1
- package/lib/browser/doc-model/editor-document-model.js +3 -8
- package/lib/browser/doc-model/editor-document-model.js.map +1 -1
- package/lib/browser/doc-model/editor-document-registry.js +2 -2
- package/lib/browser/doc-model/editor-document-registry.js.map +1 -1
- package/lib/browser/doc-model/editor-is-fn.js +3 -2
- package/lib/browser/doc-model/editor-is-fn.js.map +1 -1
- package/lib/browser/doc-model/override.js +2 -2
- package/lib/browser/doc-model/override.js.map +1 -1
- package/lib/browser/doc-model/save-task.js.map +1 -1
- package/lib/browser/doc-model/saveParticipants.js +6 -6
- package/lib/browser/doc-model/saveParticipants.js.map +1 -1
- package/lib/browser/editor-collection.service.d.ts +3 -1
- package/lib/browser/editor-collection.service.d.ts.map +1 -1
- package/lib/browser/editor-collection.service.js +44 -49
- package/lib/browser/editor-collection.service.js.map +1 -1
- package/lib/browser/editor-electron.contribution.js +2 -2
- package/lib/browser/editor-electron.contribution.js.map +1 -1
- package/lib/browser/editor-opener.js +2 -2
- package/lib/browser/editor-opener.js.map +1 -1
- package/lib/browser/editor-scrollbar/index.js.map +1 -1
- package/lib/browser/editor.contribution.js +4 -4
- package/lib/browser/editor.contribution.js.map +1 -1
- package/lib/browser/editor.decoration.service.js +2 -2
- package/lib/browser/editor.decoration.service.js.map +1 -1
- package/lib/browser/editor.override.js +2 -2
- package/lib/browser/editor.override.js.map +1 -1
- package/lib/browser/editor.status-bar.service.js +2 -2
- package/lib/browser/editor.status-bar.service.js.map +1 -1
- package/lib/browser/editor.tab.service.js +2 -2
- package/lib/browser/editor.tab.service.js.map +1 -1
- package/lib/browser/editor.view.d.ts.map +1 -1
- package/lib/browser/editor.view.js +8 -6
- package/lib/browser/editor.view.js.map +1 -1
- package/lib/browser/error.js +2 -2
- package/lib/browser/error.js.map +1 -1
- package/lib/browser/feature.js +3 -6
- package/lib/browser/feature.js.map +1 -1
- package/lib/browser/format/format.service.js +2 -2
- package/lib/browser/format/format.service.js.map +1 -1
- package/lib/browser/format/formatter-selector.js +3 -3
- package/lib/browser/format/formatter-selector.js.map +1 -1
- package/lib/browser/fs-resource/file-tree-set.d.ts.map +1 -1
- package/lib/browser/fs-resource/file-tree-set.js.map +1 -1
- package/lib/browser/fs-resource/fs-editor-doc.js +2 -2
- package/lib/browser/fs-resource/fs-editor-doc.js.map +1 -1
- package/lib/browser/fs-resource/fs-resource.js +2 -2
- package/lib/browser/fs-resource/fs-resource.js.map +1 -1
- package/lib/browser/fs-resource/index.js +2 -2
- package/lib/browser/fs-resource/index.js.map +1 -1
- package/lib/browser/grid/grid.service.d.ts.map +1 -1
- package/lib/browser/grid/grid.service.js +3 -3
- package/lib/browser/grid/grid.service.js.map +1 -1
- package/lib/browser/history/index.js +2 -2
- package/lib/browser/history/index.js.map +1 -1
- package/lib/browser/hooks/useEditor.js +2 -1
- package/lib/browser/hooks/useEditor.js.map +1 -1
- package/lib/browser/index.js +4 -4
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/language/diagnostic-collection.js.map +1 -1
- package/lib/browser/language/language-status.contribution.js +2 -2
- package/lib/browser/language/language-status.contribution.js.map +1 -1
- package/lib/browser/language/language-status.service.js +2 -2
- package/lib/browser/language/language-status.service.js.map +1 -1
- package/lib/browser/language/language.service.js +4 -4
- package/lib/browser/language/language.service.js.map +1 -1
- package/lib/browser/menu/breadcrumbs.menus.js +2 -2
- package/lib/browser/menu/breadcrumbs.menus.js.map +1 -1
- package/lib/browser/menu/editor.context.js.map +1 -1
- package/lib/browser/menu/editor.menu.js +2 -2
- package/lib/browser/menu/editor.menu.js.map +1 -1
- package/lib/browser/menu/open-type-menu.contribution.js +2 -2
- package/lib/browser/menu/open-type-menu.contribution.js.map +1 -1
- package/lib/browser/menu/title-context.menu.js +2 -2
- package/lib/browser/menu/title-context.menu.js.map +1 -1
- package/lib/browser/merge-conflict/conflict-parser.js +2 -2
- package/lib/browser/merge-conflict/conflict-parser.js.map +1 -1
- package/lib/browser/merge-conflict/merge-conflict.model.js +2 -1
- package/lib/browser/merge-conflict/merge-conflict.model.js.map +1 -1
- package/lib/browser/merge-conflict/merge-conflict.service.d.ts.map +1 -1
- package/lib/browser/merge-conflict/merge-conflict.service.js +2 -2
- package/lib/browser/merge-conflict/merge-conflict.service.js.map +1 -1
- package/lib/browser/merge-conflict/types.d.ts +2 -2
- package/lib/browser/merge-conflict/types.d.ts.map +1 -1
- package/lib/browser/merge-conflict/types.js +1 -1
- package/lib/browser/merge-conflict/types.js.map +1 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.contribution.js +2 -2
- package/lib/browser/merge-editor/merge-editor.contribution.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.provider.js +2 -2
- package/lib/browser/merge-editor/merge-editor.provider.js.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.contribution.js +2 -2
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.contribution.js.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.js +2 -2
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.js.map +1 -1
- package/lib/browser/monaco-contrib/command/command.service.js +7 -7
- package/lib/browser/monaco-contrib/command/command.service.js.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate-registry.js +2 -2
- package/lib/browser/monaco-contrib/tokenizer/textmate-registry.js.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate-tokenizer.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate-tokenizer.js +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate-tokenizer.js.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate.service.js +5 -5
- package/lib/browser/monaco-contrib/tokenizer/textmate.service.js.map +1 -1
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.contribution.js +2 -2
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.contribution.js.map +1 -1
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.js +2 -2
- package/lib/browser/monaco-contrib/typeHierarchy/typeHierarchy.service.js.map +1 -1
- package/lib/browser/navigation.view.d.ts +1 -1
- package/lib/browser/navigation.view.d.ts.map +1 -1
- package/lib/browser/navigation.view.js +3 -3
- package/lib/browser/navigation.view.js.map +1 -1
- package/lib/browser/notebook.service.js +2 -2
- package/lib/browser/notebook.service.js.map +1 -1
- package/lib/browser/preference/contribution.js +2 -2
- package/lib/browser/preference/contribution.js.map +1 -1
- package/lib/browser/preference/converter.js +4 -4
- package/lib/browser/preference/converter.js.map +1 -1
- package/lib/browser/preference/schema.js +8 -11
- package/lib/browser/preference/schema.js.map +1 -1
- package/lib/browser/preference/util.js +2 -1
- package/lib/browser/preference/util.js.map +1 -1
- package/lib/browser/quick-open/go-to-line.js +2 -2
- package/lib/browser/quick-open/go-to-line.js.map +1 -1
- package/lib/browser/quick-open/workspace-symbol-quickopen.js +2 -2
- package/lib/browser/quick-open/workspace-symbol-quickopen.js.map +1 -1
- package/lib/browser/resource.service.d.ts.map +1 -1
- package/lib/browser/resource.service.js +2 -2
- package/lib/browser/resource.service.js.map +1 -1
- package/lib/browser/tab.view.d.ts +1 -1
- package/lib/browser/tab.view.d.ts.map +1 -1
- package/lib/browser/tab.view.js.map +1 -1
- package/lib/browser/types.d.ts +2 -2
- package/lib/browser/types.d.ts.map +1 -1
- package/lib/browser/types.js +2 -2
- package/lib/browser/types.js.map +1 -1
- package/lib/browser/untitled-resource.js +6 -6
- package/lib/browser/untitled-resource.js.map +1 -1
- package/lib/browser/view/editor.react.js +2 -5
- package/lib/browser/view/editor.react.js.map +1 -1
- package/lib/browser/view/react-hook.js +2 -1
- package/lib/browser/view/react-hook.js.map +1 -1
- package/lib/browser/view/suggest-widget.js +2 -2
- package/lib/browser/view/suggest-widget.js.map +1 -1
- package/lib/browser/workbench-editor.service.d.ts.map +1 -1
- package/lib/browser/workbench-editor.service.js +8 -10
- package/lib/browser/workbench-editor.service.js.map +1 -1
- package/lib/common/doc-cache.js +5 -5
- package/lib/common/doc-cache.js.map +1 -1
- package/lib/common/editor.d.ts +2 -2
- package/lib/common/editor.d.ts.map +1 -1
- package/lib/common/editor.js +13 -28
- package/lib/common/editor.js.map +1 -1
- package/lib/common/language.js +8 -8
- package/lib/common/language.js.map +1 -1
- package/lib/common/mocks/workbench-editor.service.js +2 -2
- package/lib/common/mocks/workbench-editor.service.js.map +1 -1
- package/lib/common/notebook.d.ts +1 -0
- package/lib/common/notebook.d.ts.map +1 -1
- package/lib/common/notebook.js +2 -2
- package/lib/common/notebook.js.map +1 -1
- package/lib/common/resource.js +3 -3
- package/lib/common/resource.js.map +1 -1
- package/lib/common/utils.js +2 -1
- package/lib/common/utils.js.map +1 -1
- package/package.json +14 -14
- package/src/browser/editor-collection.service.ts +28 -12
- package/src/browser/quick-open/workspace-symbol-quickopen.ts +1 -1
- package/src/browser/tab.view.tsx +3 -3
- package/src/browser/workbench-editor.service.ts +1 -0
- package/src/common/editor.ts +2 -22
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"breadcrumbs.menus.js","sourceRoot":"","sources":["../../../src/browser/menu/breadcrumbs.menus.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,mEAAgH;AAMzG,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAOjC,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,KAAkB,EAAE,GAAQ;QACrD,MAAM,YAAY,GAAG,KAAK,CAAC,iBAAiB,CAAC;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;YAC3C,EAAE,EAAE,aAAM,CAAC,uBAAuB;YAClC,iBAAiB,EAAE,YAAY;SAChC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAE7C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YACxB,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE;YAChB,SAAS;YACT,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;SACvB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"breadcrumbs.menus.js","sourceRoot":"","sources":["../../../src/browser/menu/breadcrumbs.menus.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,mEAAgH;AAMzG,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IAOjC,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,KAAkB,EAAE,GAAQ;QACrD,MAAM,YAAY,GAAG,KAAK,CAAC,iBAAiB,CAAC;QAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;YAC3C,EAAE,EAAE,aAAM,CAAC,uBAAuB;YAClC,iBAAiB,EAAE,YAAY;SAChC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAE7C,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YACxB,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE;YAChB,SAAS;YACT,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;SACvB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AApBC;IAAC,IAAA,cAAS,EAAC,iCAA0B,CAAC;sCACL,iCAA0B;8DAAC;AAE5D;IAAC,IAAA,cAAS,EAAC,uBAAgB,CAAC;sCACM,uBAAgB;+DAAC;AALxC,sBAAsB;IADlC,IAAA,eAAU,GAAE;GACA,sBAAsB,CAqBlC;AArBY,wDAAsB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.context.js","sourceRoot":"","sources":["../../../src/browser/menu/editor.context.ts"],"names":[],"mappings":";;;;AAAA,iEAA4E;AAC5E,mEAAgH;AAChH,qEAA+C;AAE/C,kGAA4E;AAE5E,uFAAmF;AACnF,oGAAsH;AACtH,0GAAsG;AAEtG,oHAA2H;AAE3H,MAAa,2BAA4B,SAAQ,6BAAU;IAGlD,MAAM,CAAC,GAAG,CAAC,MAAmB;QACnC,OAAO,MAAM,CAAC,eAAe,CAAwB,mCAAqB,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IAID,YACmB,kBAA8C,EAC9C,uBAA2C,EAC3C,mBAAqC,EAC9C,UAAuB;QAE/B,KAAK,EAAE,CAAC;QALS,uBAAkB,GAAlB,kBAAkB,CAA4B;QAC9C,4BAAuB,GAAvB,uBAAuB,CAAoB;QAC3C,wBAAmB,GAAnB,mBAAmB,CAAkB;QAC9C,eAAU,GAAV,UAAU,CAAa;QAG/B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,eAAe,CAC3C,IAAI,CAAC,uBAAuB,CAAC,YAAY,CAAE,IAAI,CAAC,UAAkB,CAAC,kBAAkB,CAAC,CACvF,CAAC;QACF,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7E,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9B,IAAI,CAAC,CAAC,OAAO,KAAK,kBAAO,CAAC,WAAW,EAAE
|
|
1
|
+
{"version":3,"file":"editor.context.js","sourceRoot":"","sources":["../../../src/browser/menu/editor.context.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,6 @@ let EditorActionRegistryImpl = class EditorActionRegistryImpl extends ide_core_b
|
|
|
31
31
|
return this._cachedMenus.get(key);
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
|
-
exports.EditorActionRegistryImpl = EditorActionRegistryImpl;
|
|
35
34
|
tslib_1.__decorate([
|
|
36
35
|
(0, di_1.Autowired)(ide_core_browser_1.IContextKeyService),
|
|
37
36
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -44,7 +43,8 @@ tslib_1.__decorate([
|
|
|
44
43
|
(0, di_1.Autowired)(ide_core_browser_1.ILogger),
|
|
45
44
|
tslib_1.__metadata("design:type", Object)
|
|
46
45
|
], EditorActionRegistryImpl.prototype, "logger", void 0);
|
|
47
|
-
|
|
46
|
+
EditorActionRegistryImpl = tslib_1.__decorate([
|
|
48
47
|
(0, di_1.Injectable)()
|
|
49
48
|
], EditorActionRegistryImpl);
|
|
49
|
+
exports.EditorActionRegistryImpl = EditorActionRegistryImpl;
|
|
50
50
|
//# sourceMappingURL=editor.menu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.menu.js","sourceRoot":"","sources":["../../../src/browser/menu/editor.menu.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAkG;AAClG,mEAA4G;AAOrG,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAAU;IAAjD;;QACG,iBAAY,GAAG,IAAI,GAAG,EAAwB,CAAC;IAkCzD,CAAC;IAvBC,oBAAoB;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC,CAAC;QAC/F,OAAO,IAAI,6BAAU,EAAE,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,KAAmB;QACzB,MAAM,GAAG,GAAG,KAAK,CAAC,oBAAoB;YACpC,CAAC,CAAC,cAAc,GAAG,KAAK,CAAC,oBAAoB,CAAC,KAAK,EAAE;YACrD,CAAC,CAAC,oBAAoB,GAAG,KAAK,CAAC,IAAI,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"editor.menu.js","sourceRoot":"","sources":["../../../src/browser/menu/editor.menu.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAkG;AAClG,mEAA4G;AAOrG,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,6BAAU;IAAjD;;QACG,iBAAY,GAAG,IAAI,GAAG,EAAwB,CAAC;IAkCzD,CAAC;IAvBC,oBAAoB;QAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,iEAAiE,CAAC,CAAC,CAAC;QAC/F,OAAO,IAAI,6BAAU,EAAE,CAAC;IAC1B,CAAC;IAED,OAAO,CAAC,KAAmB;QACzB,MAAM,GAAG,GAAG,KAAK,CAAC,oBAAoB;YACpC,CAAC,CAAC,cAAc,GAAG,KAAK,CAAC,oBAAoB,CAAC,KAAK,EAAE;YACrD,CAAC,CAAC,oBAAoB,GAAG,KAAK,CAAC,IAAI,CAAC;QACtC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC/B,MAAM,iBAAiB,GAAG,KAAK,CAAC,oBAAoB;gBAClD,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAE,KAAK,CAAC,oBAAoB,CAAC,YAAoB,CAAC,kBAAkB,CAAC;gBAC1G,CAAC,CAAE,KAAqB,CAAC,iBAAiB,CAAC;YAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAChC,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC;gBAC1B,EAAE,EAAE,aAAM,CAAC,WAAW;gBACtB,iBAAiB;aAClB,CAAC,CACH,CAAC;YACF,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;SACnC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACrC,CAAC;CACF,CAAA;AAhCC;IAAC,IAAA,cAAS,EAAC,qCAAkB,CAAC;;mEACgB;AAE9C;IAAC,IAAA,cAAS,EAAC,iCAA0B,CAAC;sCACR,iCAA0B;6DAAC;AAEzD;IAAC,IAAA,cAAS,EAAC,0BAAO,CAAC;;wDACH;AAVL,wBAAwB;IADpC,IAAA,eAAU,GAAE;GACA,wBAAwB,CAmCpC;AAnCY,4DAAwB"}
|
|
@@ -71,7 +71,6 @@ let OpenTypeMenuContribution = class OpenTypeMenuContribution extends ide_core_c
|
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
73
|
};
|
|
74
|
-
exports.OpenTypeMenuContribution = OpenTypeMenuContribution;
|
|
75
74
|
tslib_1.__decorate([
|
|
76
75
|
(0, di_1.Autowired)(types_1.WorkbenchEditorService),
|
|
77
76
|
tslib_1.__metadata("design:type", workbench_editor_service_1.WorkbenchEditorServiceImpl)
|
|
@@ -80,8 +79,9 @@ tslib_1.__decorate([
|
|
|
80
79
|
(0, di_1.Autowired)(next_1.IMenuRegistry),
|
|
81
80
|
tslib_1.__metadata("design:type", next_1.IMenuRegistry)
|
|
82
81
|
], OpenTypeMenuContribution.prototype, "menuRegistry", void 0);
|
|
83
|
-
|
|
82
|
+
OpenTypeMenuContribution = tslib_1.__decorate([
|
|
84
83
|
(0, di_helper_1.Domain)(ide_core_common_1.CommandContribution, next_1.MenuContribution),
|
|
85
84
|
tslib_1.__metadata("design:paramtypes", [])
|
|
86
85
|
], OpenTypeMenuContribution);
|
|
86
|
+
exports.OpenTypeMenuContribution = OpenTypeMenuContribution;
|
|
87
87
|
//# sourceMappingURL=open-type-menu.contribution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"open-type-menu.contribution.js","sourceRoot":"","sources":["../../../src/browser/menu/open-type-menu.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAAqD;AACrD,mEAOkD;AAClD,+DAAgH;AAChH,uEAAiE;AAEjE,oCAAkD;AAGlD,4EAA2E;AAE3E,IAAU,kBAAkB,CAI3B;AAJD,WAAU,kBAAkB;IACb,mCAAgB,GAAY;QACvC,EAAE,EAAE,iBAAiB;KACtB,CAAC;AACJ,CAAC,EAJS,kBAAkB,KAAlB,kBAAkB,QAI3B;AAGM,IAAM,wBAAwB,GAA9B,MAAM,wBAAyB,SAAQ,4BAAU;IAOtD,gBAAgB,CAAC,QAAyB;QACxC,QAAQ,CAAC,eAAe,CAAC,kBAAkB,CAAC,gBAAgB,EAAE;YAC5D,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE;gBACnB,MAAM,OAAO,GAAW,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAC9C,IAAI,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE
|
|
1
|
+
{"version":3,"file":"open-type-menu.contribution.js","sourceRoot":"","sources":["../../../src/browser/menu/open-type-menu.contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,7 +36,6 @@ let TabTitleMenuService = class TabTitleMenuService {
|
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
};
|
|
39
|
-
exports.TabTitleMenuService = TabTitleMenuService;
|
|
40
39
|
tslib_1.__decorate([
|
|
41
40
|
(0, di_1.Autowired)(next_1.AbstractContextMenuService),
|
|
42
41
|
tslib_1.__metadata("design:type", next_1.AbstractContextMenuService)
|
|
@@ -49,7 +48,8 @@ tslib_1.__decorate([
|
|
|
49
48
|
(0, di_1.Autowired)(ide_core_browser_1.IContextKeyService),
|
|
50
49
|
tslib_1.__metadata("design:type", Object)
|
|
51
50
|
], TabTitleMenuService.prototype, "contextKeyService", void 0);
|
|
52
|
-
|
|
51
|
+
TabTitleMenuService = tslib_1.__decorate([
|
|
53
52
|
(0, di_1.Injectable)()
|
|
54
53
|
], TabTitleMenuService);
|
|
54
|
+
exports.TabTitleMenuService = TabTitleMenuService;
|
|
55
55
|
//# sourceMappingURL=title-context.menu.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"title-context.menu.js","sourceRoot":"","sources":["../../../src/browser/menu/title-context.menu.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAgE;AAChE,iFAAwF;AACxF,mEAAgH;AAOzG,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAY9B,IAAY,qBAAqB;QAC/B,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE
|
|
1
|
+
{"version":3,"file":"title-context.menu.js","sourceRoot":"","sources":["../../../src/browser/menu/title-context.menu.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAgE;AAChE,iFAAwF;AACxF,mEAAgH;AAOzG,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAY9B,IAAY,qBAAqB;QAC/B,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE;YAChC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;SAC7F;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAED,IAAI,CAAC,CAAS,EAAE,CAAS,EAAE,GAAQ,EAAE,KAAmB;QACtD,mBAAmB;QACnB,MAAM,YAAY,GAAI,KAAqB,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;QAC7E,MAAM,eAAe,GAAG,IAAI,6BAAkB,CAAC,YAAY,CAAC,CAAC;QAC7D,eAAe,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACzB,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAErC,MAAM,KAAK,GAAG,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC;YAC3C,EAAE,EAAE,aAAM,CAAC,kBAAkB;YAC7B,iBAAiB,EAAE,YAAY;SAChC,CAAC,CAAC;QACH,MAAM,SAAS,GAAG,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC7C,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,YAAY,CAAC,OAAO,EAAE,CAAC;QAEvB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YACxB,MAAM,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE;YAChB,SAAS;YACT,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC;YACtB,MAAM,EAAE,GAAG,EAAE;gBACX,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YACxC,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA1CC;IAAC,IAAA,cAAS,EAAC,iCAA0B,CAAC;sCACtB,iCAA0B;2DAAC;AAE3C;IAAC,IAAA,cAAS,EAAC,uBAAgB,CAAC;sCACX,uBAAgB;4DAAC;AAElC;IAAC,IAAA,cAAS,EAAC,qCAAkB,CAAC;;8DACQ;AAR3B,mBAAmB;IAD/B,IAAA,eAAU,GAAE;GACA,mBAAmB,CA2C/B;AA3CY,kDAAmB"}
|
|
@@ -137,10 +137,10 @@ let MergeConflictParser = MergeConflictParser_1 = class MergeConflictParser exte
|
|
|
137
137
|
this._conflictRangeCaches.clear();
|
|
138
138
|
}
|
|
139
139
|
};
|
|
140
|
-
|
|
141
|
-
exports.MergeConflictParser = MergeConflictParser = MergeConflictParser_1 = tslib_1.__decorate([
|
|
140
|
+
MergeConflictParser = MergeConflictParser_1 = tslib_1.__decorate([
|
|
142
141
|
(0, di_1.Injectable)()
|
|
143
142
|
], MergeConflictParser);
|
|
143
|
+
exports.MergeConflictParser = MergeConflictParser;
|
|
144
144
|
function scanItemToMergeConflictDescriptor(document, scanned) {
|
|
145
145
|
// Validate we have all the required lines within the scan item.
|
|
146
146
|
if (!scanned.startHeader || !scanned.splitter || !scanned.endFooter) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conflict-parser.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/conflict-parser.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;AAChG,wIAAwI;;;;;AAExI,qCAA0C;AAC1C,+DAAuE;AACvE,qEAA+C;AAI/C,MAAM,iBAAiB,GAAG,SAAS,CAAC;AACpC,MAAM,qBAAqB,GAAG,SAAS,CAAC;AACxC,MAAM,cAAc,GAAG,SAAS,CAAC;AACjC,MAAM,eAAe,GAAG,SAAS,CAAC;AAgBlC,MAAa,QAAQ;IAOnB,YAAY,QAAkC,EAAE,IAAY;QAC1D,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,IAAI,CAAC,IAAI,IAAI,GAAG,QAAQ,CAAC,YAAY,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"conflict-parser.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/conflict-parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.useMergeConflictModel =
|
|
3
|
+
exports.useMergeConflictModel = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
|
|
6
6
|
const react_1 = require("react");
|
|
@@ -46,4 +46,5 @@ function useMergeConflictModel(uri) {
|
|
|
46
46
|
canNavigate: conflictsCount > 0,
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
|
+
exports.useMergeConflictModel = useMergeConflictModel;
|
|
49
50
|
//# sourceMappingURL=merge-conflict.model.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-conflict.model.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.model.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"merge-conflict.model.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.model.ts"],"names":[],"mappings":";;;;AAAA,uEAAuC;AACvC,iCAAqD;AAErD,iEAA2E;AAC3E,mDAA2D;AAE3D,kDAA4D;AAE5D,qEAAgE;AAEhE,SAAgB,qBAAqB,CAAC,GAAQ;IAC5C,MAAM,WAAW,GAAG,IAAA,kCAAsB,EAAC,GAAG,CAAC,CAAC;IAEhD;;OAEG;IACH,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAClE,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,IAAA,gBAAQ,EAAC,CAAC,CAAC,CAAC;IAExD,MAAM,oBAAoB,GAAG,IAAA,gCAAa,EAAuB,6CAAoB,CAAC,CAAC;IAEvF,MAAM,OAAO,GAAG,IAAA,eAAO,EACrB,GAAG,EAAE,CAAC,IAAA,iCAAc,EAAC,uCAAuC,EAAE,cAAc,CAAC,EAC7E,CAAC,cAAc,CAAC,CACjB,CAAC;IAEF,IAAA,iBAAS,EAAC,GAAG,EAAE;QACb,MAAM,WAAW,GAAG,IAAI,2BAAe,EAAE,CAAC;QAE1C,IAAI,WAAW,EAAE;YACf,MAAM,GAAG,GAAG,GAAG,EAAE;gBACf,MAAM,CAAC,GAAG,oBAAoB,CAAC,YAAY,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;gBAC1E,iBAAiB,CAAC,CAAC,CAAC,CAAC;gBACrB,IAAI,CAAC,GAAG,CAAC,EAAE;oBACT,oBAAoB,CAAC,IAAI,CAAC,CAAC;iBAC5B;YACH,CAAC,CAAC;YAEF,MAAM,WAAW,GAAG,IAAA,kBAAQ,EAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAEvC,WAAW,CAAC,GAAG,CACb,WAAW,CAAC,cAAc,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE;gBACnD,WAAW,EAAE,CAAC;YAChB,CAAC,CAAC,CACH,CAAC;YAEF,GAAG,EAAE,CAAC;YACN,OAAO,GAAG,EAAE;gBACV,WAAW,CAAC,OAAO,EAAE,CAAC;gBACtB,oBAAoB,CAAC,KAAK,EAAE,CAAC;gBAC7B,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBAC5B,iBAAiB,CAAC,CAAC,CAAC,CAAC;YACvB,CAAC,CAAC;SACH;IACH,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,OAAO;QACL,UAAU,EAAE,iBAAiB;QAC7B,OAAO;QACP,WAAW,EAAE,cAAc,GAAG,CAAC;KAChC,CAAC;AACJ,CAAC;AAnDD,sDAmDC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-conflict.service.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAM/C,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE/E,qBACa,oBAAoB;IAE/B,MAAM,EAAE,mBAAmB,CAAC;IAG5B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IAGvD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAEjD,SAAS,
|
|
1
|
+
{"version":3,"file":"merge-conflict.service.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAM/C,OAAO,EAAE,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAE/E,qBACa,oBAAoB;IAE/B,MAAM,EAAE,mBAAmB,CAAC;IAG5B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;IAGvD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAkB;IAEjD,SAAS,0BAAiC;IAE1C,YAAY,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU;IAK5C,KAAK,IAAI,IAAI;YAIC,QAAQ;IA0BtB,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,gBAAgB,IAAI,OAAO,CAAC,IAAI,CAAC;CAGlC"}
|
|
@@ -47,7 +47,6 @@ let MergeConflictService = class MergeConflictService {
|
|
|
47
47
|
return this.navigate(this.editorService.currentEditor, merge_editor_1.NavigationDirection.Backwards);
|
|
48
48
|
}
|
|
49
49
|
};
|
|
50
|
-
exports.MergeConflictService = MergeConflictService;
|
|
51
50
|
tslib_1.__decorate([
|
|
52
51
|
(0, di_1.Autowired)(conflict_parser_1.MergeConflictParser),
|
|
53
52
|
tslib_1.__metadata("design:type", conflict_parser_1.MergeConflictParser)
|
|
@@ -60,7 +59,8 @@ tslib_1.__decorate([
|
|
|
60
59
|
(0, di_1.Autowired)(ide_overlay_1.IMessageService),
|
|
61
60
|
tslib_1.__metadata("design:type", Object)
|
|
62
61
|
], MergeConflictService.prototype, "messageService", void 0);
|
|
63
|
-
|
|
62
|
+
MergeConflictService = tslib_1.__decorate([
|
|
64
63
|
(0, di_1.Injectable)()
|
|
65
64
|
], MergeConflictService);
|
|
65
|
+
exports.MergeConflictService = MergeConflictService;
|
|
66
66
|
//# sourceMappingURL=merge-conflict.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-conflict.service.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AAErD,wFAAoH;AACpH,uDAAwD;AAExD,oCAA2D;AAE3D,uDAA+E;AAGxE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAA1B;QAUL,cAAS,GAAG,EAA6B,CAAC;IA4C5C,CAAC;IA1CC,YAAY,CAAC,KAA+B;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,MAAe,EAAE,SAA8B;QACpE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAG,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEhE,MAAM,gBAAgB,GAAG,IAAA,qCAAsB,EAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW,EAAG,CAAC,CAAC;QAEvG,IAAI,CAAC,gBAAgB,EAAE
|
|
1
|
+
{"version":3,"file":"merge-conflict.service.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/merge-conflict.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AAErD,wFAAoH;AACpH,uDAAwD;AAExD,oCAA2D;AAE3D,uDAA+E;AAGxE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAA1B;QAUL,cAAS,GAAG,EAA6B,CAAC;IA4C5C,CAAC;IA1CC,YAAY,CAAC,KAA+B;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,KAAK;QACH,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;IACtB,CAAC;IAEO,KAAK,CAAC,QAAQ,CAAC,MAAe,EAAE,SAA8B;QACpE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAG,CAAC,CAAC;QAC3E,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEhE,MAAM,gBAAgB,GAAG,IAAA,qCAAsB,EAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,YAAY,CAAC,WAAW,EAAG,CAAC,CAAC;QAEvG,IAAI,CAAC,gBAAgB,EAAE;YACrB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAC;YACrE,OAAO;SACR;aAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE;YACxC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;YACzE,OAAO;SACR;aAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE;YAClC,kBAAkB;YAClB,OAAO;SACR;QAED,MAAM,CAAC,YAAY,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC,CAAC;QAE3E,kFAAkF;QAClF,MAAM,KAAK,GAAG,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAE/C,MAAM,CAAC,YAAY,CAAC,mCAAmC,CAAC,KAAK,CAAC,CAAC;QAC/D,MAAM,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IAC9B,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,aAAc,EAAE,kCAAmB,CAAC,QAAQ,CAAC,CAAC;IACxF,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,aAAc,EAAE,kCAAmB,CAAC,SAAS,CAAC,CAAC;IACzF,CAAC;CACF,CAAA;AArDC;IAAC,IAAA,cAAS,EAAC,qCAAmB,CAAC;sCACvB,qCAAmB;oDAAC;AAE5B;IAAC,IAAA,cAAS,EAAC,8BAAsB,CAAC;sCACF,8BAAsB;2DAAC;AAEvD;IAAC,IAAA,cAAS,EAAC,6BAAe,CAAC;;4DACsB;AARtC,oBAAoB;IADhC,IAAA,eAAU,GAAE;GACA,oBAAoB,CAsDhC;AAtDY,oDAAoB"}
|
|
@@ -33,7 +33,7 @@ export interface ICacheDocumentMergeConflict extends IDocumentMergeConflictDescr
|
|
|
33
33
|
aiContent?: string;
|
|
34
34
|
}
|
|
35
35
|
export declare namespace AI_COMMAND {
|
|
36
|
-
const ACCEPT
|
|
37
|
-
const REVERT
|
|
36
|
+
const ACCEPT: string;
|
|
37
|
+
const REVERT: string;
|
|
38
38
|
}
|
|
39
39
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;CACjC;AAED,0BAAkB,UAAU;IAC1B,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,IAAI,IAAA;CACL;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,gCAAgC;IAC9E,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClF,SAAS,CACP,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAClC,IAAI,EAAE;QAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC5D,IAAI,CAAC;CACT;AAED,MAAM,WAAW,gCAAgC;IAC/C,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,YAAY,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,2BAA4B,SAAQ,gCAAgC;IACnF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,yBAAiB,UAAU,CAAC;IAEnB,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAE/C,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;CACjC;AAED,0BAAkB,UAAU;IAC1B,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,IAAI,IAAA;CACL;AAED,MAAM,WAAW,uBAAuB;IACtC,cAAc,EAAE,OAAO,CAAC;IACxB,iBAAiB,EAAE,OAAO,CAAC;IAC3B,oBAAoB,EAAE,OAAO,CAAC;CAC/B;AAED,MAAM,WAAW,sBAAuB,SAAQ,gCAAgC;IAC9E,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClF,SAAS,CACP,IAAI,EAAE,UAAU,EAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAClC,IAAI,EAAE;QAAE,OAAO,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAC5D,IAAI,CAAC;CACT;AAED,MAAM,WAAW,gCAAgC;IAC/C,CAAC,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;IACpB,OAAO,EAAE,YAAY,CAAC;IACtB,QAAQ,EAAE,YAAY,CAAC;IACvB,eAAe,EAAE,YAAY,EAAE,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;CACxB;AAED,MAAM,WAAW,2BAA4B,SAAQ,gCAAgC;IACnF,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,yBAAiB,UAAU,CAAC;IAEnB,MAAM,MAAM,QAAgC,CAAC;IAC7C,MAAM,MAAM,QAAgC,CAAC;CACrD"}
|
|
@@ -6,5 +6,5 @@ var AI_COMMAND;
|
|
|
6
6
|
const MERGE_CONFLICT = 'merge-conflict';
|
|
7
7
|
AI_COMMAND.ACCEPT = `${MERGE_CONFLICT}.ai.accept`;
|
|
8
8
|
AI_COMMAND.REVERT = `${MERGE_CONFLICT}.ai.revert`;
|
|
9
|
-
})(AI_COMMAND
|
|
9
|
+
})(AI_COMMAND = exports.AI_COMMAND || (exports.AI_COMMAND = {}));
|
|
10
10
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":";;;AA2CA,IAAiB,UAAU,CAI1B;AAJD,WAAiB,UAAU;IACzB,MAAM,cAAc,GAAG,gBAAgB,CAAC;IAC3B,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;IACvC,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;AACtD,CAAC,EAJgB,UAAU,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/browser/merge-conflict/types.ts"],"names":[],"mappings":";;;AA2CA,IAAiB,UAAU,CAI1B;AAJD,WAAiB,UAAU;IACzB,MAAM,cAAc,GAAG,gBAAgB,CAAC;IAC3B,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;IACvC,iBAAM,GAAG,GAAG,cAAc,YAAY,CAAC;AACtD,CAAC,EAJgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAI1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,iEAOoC;AACpC,kHAA8G;AAE9G,iFAA+E;AAC/E,qFAAgF;AAGzE,MAAM,0BAA0B,GAAuC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC7F,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;IACzB,MAAM,oBAAoB,GAAG,IAAA,gCAAa,EAAuB,6CAAoB,CAAC,CAAC;IACvF,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAiB,iCAAc,CAAC,CAAC;IACrE,MAAM,eAAe,GAAG,IAAA,gCAAa,EAAkB,kCAAe,CAAC,CAAC;IAExE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAA,4CAAqB,EAAC,GAAG,CAAC,CAAC;IAExE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;IAC1C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,oBAAoB,CAAC,YAAY,EAAE,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QAC7C,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,aAAa,EAAE
|
|
1
|
+
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":";;;;AAAA,uDAAqD;AAErD,iEAOoC;AACpC,kHAA8G;AAE9G,iFAA+E;AAC/E,qFAAgF;AAGzE,MAAM,0BAA0B,GAAuC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE;IAC7F,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;IACzB,MAAM,oBAAoB,GAAG,IAAA,gCAAa,EAAuB,6CAAoB,CAAC,CAAC;IACvF,MAAM,cAAc,GAAG,IAAA,gCAAa,EAAiB,iCAAc,CAAC,CAAC;IACrE,MAAM,eAAe,GAAG,IAAA,gCAAa,EAAkB,kCAAe,CAAC,CAAC;IAExE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAA,4CAAqB,EAAC,GAAG,CAAC,CAAC;IAExE,MAAM,CAAC,aAAa,EAAE,gBAAgB,CAAC,GAAG,IAAA,gBAAQ,EAAC,KAAK,CAAC,CAAC;IAE1D,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,oBAAoB,CAAC,gBAAgB,EAAE,CAAC;IAC1C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,UAAU,GAAG,IAAA,mBAAW,EAAC,GAAG,EAAE;QAClC,oBAAoB,CAAC,YAAY,EAAE,CAAC;IACtC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,eAAe,GAAG,IAAA,mBAAW,EAAC,KAAK,IAAI,EAAE;QAC7C,gBAAgB,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,aAAa,EAAE;YACjB,MAAM,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;SACzF;aAAM;YACL,MAAM,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,aAAa,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;SACpF;QACD,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC;IAEzB,IAAI,CAAC,UAAU,EAAE;QACf,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,8BAAC,4BAAY,IACX,GAAG,EAAE,GAAG,EACR,UAAU,EAAC,MAAM,EACjB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,UAAU,EAAE,UAAU,EACtB,UAAU,EAAE,UAAU,EACtB,aAAa,EAAE,aAAa,EAC5B,WAAW,EAAE,eAAe,EAC5B,OAAO,EAAE,GAAG,EAAE;YACZ,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,SAAS,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC3E,CAAC,EACD,cAAc,EAAE,GAAG,EAAE;YACnB,CAAC,+BAAY,CAAC,qBAAqB,EAAE,+BAAY,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;gBACpG,IAAI,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,eAAe,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;oBAC7E,cAAc,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;iBAC7C;YACH,CAAC,CAAC,CAAC;QACL,CAAC,GACD,CACH,CAAC;AACJ,CAAC,CAAC;AAtDW,QAAA,0BAA0B,8BAsDrC"}
|
|
@@ -32,12 +32,12 @@ let MergeEditorContribution = class MergeEditorContribution extends ide_core_bro
|
|
|
32
32
|
});
|
|
33
33
|
}
|
|
34
34
|
};
|
|
35
|
-
exports.MergeEditorContribution = MergeEditorContribution;
|
|
36
35
|
tslib_1.__decorate([
|
|
37
36
|
(0, di_1.Autowired)(),
|
|
38
37
|
tslib_1.__metadata("design:type", merge_editor_provider_1.MergeEditorResourceProvider)
|
|
39
38
|
], MergeEditorContribution.prototype, "mergeEditorResourceProvider", void 0);
|
|
40
|
-
|
|
39
|
+
MergeEditorContribution = tslib_1.__decorate([
|
|
41
40
|
(0, ide_core_browser_1.Domain)(types_1.BrowserEditorContribution)
|
|
42
41
|
], MergeEditorContribution);
|
|
42
|
+
exports.MergeEditorContribution = MergeEditorContribution;
|
|
43
43
|
//# sourceMappingURL=merge-editor.contribution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAAyE;AAGzE,oCAA8F;AAE9F,mEAAsE;AACtE,6EAA0E;AAE1E,MAAM,4BAA4B,GAAG,8BAA8B,CAAC;AAG7D,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,6BAAU;IAIrD,gBAAgB,CAAC,eAAgC;QAC/C,eAAe,CAAC,wBAAwB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC7E,CAAC;IAED,uBAAuB,CAAC,QAAiC;QACvD,QAAQ,CAAC,+BAA+B,CAAC,sBAAc,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;YAClF,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,sBAAc,CAAC,WAAW;aACjC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,wBAAwB,CAAC;YAChC,EAAE,EAAE,4BAA4B;YAChC,SAAS,EAAE,uDAA0B;YACrC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC/B,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;gBACzB,IAAI,GAAG,CAAC,MAAM,KAAK,0BAAO,CAAC,IAAI,EAAE
|
|
1
|
+
{"version":3,"file":"merge-editor.contribution.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAAyE;AAGzE,oCAA8F;AAE9F,mEAAsE;AACtE,6EAA0E;AAE1E,MAAM,4BAA4B,GAAG,8BAA8B,CAAC;AAG7D,IAAM,uBAAuB,GAA7B,MAAM,uBAAwB,SAAQ,6BAAU;IAIrD,gBAAgB,CAAC,eAAgC;QAC/C,eAAe,CAAC,wBAAwB,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC7E,CAAC;IAED,uBAAuB,CAAC,QAAiC;QACvD,QAAQ,CAAC,+BAA+B,CAAC,sBAAc,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;YAClF,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,sBAAc,CAAC,WAAW;aACjC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,QAAQ,CAAC,wBAAwB,CAAC;YAChC,EAAE,EAAE,4BAA4B;YAChC,SAAS,EAAE,uDAA0B;YACrC,kBAAkB,EAAE,CAAC,QAAQ,EAAE,EAAE;gBAC/B,MAAM,EAAE,GAAG,EAAE,GAAG,QAAQ,CAAC;gBACzB,IAAI,GAAG,CAAC,MAAM,KAAK,0BAAO,CAAC,IAAI,EAAE;oBAC/B,OAAO,KAAK,CAAC;iBACd;gBACD,4BAA4B;gBAC5B,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA3BC;IAAC,IAAA,cAAS,GAAE;sCACkC,mDAA2B;4EAAC;AAF/D,uBAAuB;IADnC,IAAA,yBAAM,EAAC,iCAAyB,CAAC;GACrB,uBAAuB,CA4BnC;AA5BY,0DAAuB"}
|
|
@@ -48,7 +48,6 @@ let MergeEditorResourceProvider = class MergeEditorResourceProvider extends ide_
|
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
};
|
|
51
|
-
exports.MergeEditorResourceProvider = MergeEditorResourceProvider;
|
|
52
51
|
tslib_1.__decorate([
|
|
53
52
|
(0, di_1.Autowired)(ide_core_browser_1.LabelService),
|
|
54
53
|
tslib_1.__metadata("design:type", ide_core_browser_1.LabelService)
|
|
@@ -57,7 +56,8 @@ tslib_1.__decorate([
|
|
|
57
56
|
(0, di_1.Autowired)(merge_editor_service_1.MergeEditorService),
|
|
58
57
|
tslib_1.__metadata("design:type", merge_editor_service_1.MergeEditorService)
|
|
59
58
|
], MergeEditorResourceProvider.prototype, "mergeEditorService", void 0);
|
|
60
|
-
|
|
59
|
+
MergeEditorResourceProvider = tslib_1.__decorate([
|
|
61
60
|
(0, di_1.Injectable)()
|
|
62
61
|
], MergeEditorResourceProvider);
|
|
62
|
+
exports.MergeEditorResourceProvider = MergeEditorResourceProvider;
|
|
63
63
|
//# sourceMappingURL=merge-editor.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.provider.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA2F;AAC3F,qHAAgH;AAIzG,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,+BAAY;IAAtD;;QACL,WAAM,GAAG,aAAa,CAAC;IA8CzB,CAAC;IAtCQ,eAAe,CAAC,GAAQ;QAC7B,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;QAEpD,IAAI
|
|
1
|
+
{"version":3,"file":"merge-editor.provider.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.provider.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAA2F;AAC3F,qHAAgH;AAIzG,IAAM,2BAA2B,GAAjC,MAAM,2BAA4B,SAAQ,+BAAY;IAAtD;;QACL,WAAM,GAAG,aAAa,CAAC;IA8CzB,CAAC;IAtCQ,eAAe,CAAC,GAAQ;QAC7B,MAAM,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,cAAc,EAAE,CAAC;QAEpD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YAC3D,MAAM,eAAe,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YACxC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACxD,OAAO;gBACL,cAAc,EAAE,IAAI;gBACpB,IAAI;gBACJ,IAAI;gBACJ,GAAG;gBACH,QAAQ,EAAE;oBACR,QAAQ;oBACR,MAAM;oBACN,MAAM;oBACN,MAAM;iBACP;aACF,CAAC;SACH;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;IAEM,mBAAmB,CAAC,QAAwB,EAAE,eAAmC;QACtF,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAEvD,IAAI;YACF,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YAC/C,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC;YACjC,MAAM,SAAS,GAAG,IAAI,sBAAG,CAAC,MAAM,CAAC,CAAC;YAClC,IAAI,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACpD,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACpD;IACH,CAAC;CACF,CAAA;AA5CC;IAAC,IAAA,cAAS,EAAC,+BAAY,CAAC;sCACO,+BAAY;iEAAC;AAE5C;IAAC,IAAA,cAAS,EAAC,yCAAkB,CAAC;sCACO,yCAAkB;uEAAC;AAP7C,2BAA2B;IADvC,IAAA,eAAU,GAAE;GACA,2BAA2B,CA+CvC;AA/CY,kEAA2B"}
|
|
@@ -43,7 +43,6 @@ let CallHierarchyContribution = class CallHierarchyContribution {
|
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
45
|
};
|
|
46
|
-
exports.CallHierarchyContribution = CallHierarchyContribution;
|
|
47
46
|
tslib_1.__decorate([
|
|
48
47
|
(0, di_1.Autowired)(ide_core_browser_1.IContextKeyService),
|
|
49
48
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -52,7 +51,8 @@ tslib_1.__decorate([
|
|
|
52
51
|
(0, di_1.Autowired)(callHierarchy_1.ICallHierarchyService),
|
|
53
52
|
tslib_1.__metadata("design:type", Object)
|
|
54
53
|
], CallHierarchyContribution.prototype, "callHierarchyService", void 0);
|
|
55
|
-
|
|
54
|
+
CallHierarchyContribution = tslib_1.__decorate([
|
|
56
55
|
(0, ide_core_browser_1.Domain)(ide_core_browser_1.CommandContribution, types_1.BrowserEditorContribution)
|
|
57
56
|
], CallHierarchyContribution);
|
|
57
|
+
exports.CallHierarchyContribution = CallHierarchyContribution;
|
|
58
58
|
//# sourceMappingURL=callHierarchy.contribution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callHierarchy.contribution.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAQoC;AACpC,oFAA+E;AAC/E,0FAIgE;AAGhE,uCAAyF;AAE5E,QAAA,kCAAkC,GAAG;IAChD,EAAE,EAAE,8BAA8B;CACnC,CAAC;AAEW,QAAA,kCAAkC,GAAG;IAChD,EAAE,EAAE,8BAA8B;CACnC,CAAC;AAEW,QAAA,kCAAkC,GAAG;IAChD,EAAE,EAAE,8BAA8B;CACnC,CAAC;AAEF,MAAM,4BAA4B,GAAG,IAAI,+BAAa,CAAU,gCAAgC,EAAE,KAAK,CAAC,CAAC;AAGlG,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IASpC,gBAAgB,CAAC,QAAyB;QACxC,QAAQ,CAAC,eAAe,CAAC,0CAAkC,EAAE;YAC3D,OAAO,EAAE,CAAC,QAAa,EAAE,QAAkB,EAAE,EAAE,CAC7C,IAAI,CAAC,oBAAoB,CAAC,4BAA4B,CAAC,QAAQ,EAAE,QAAQ,CAAC;SAC7E,CAAC,CAAC;QAEH,QAAQ,CAAC,eAAe,CAAC,0CAAkC,EAAE;YAC3D,OAAO,EAAE,CAAC,IAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,IAAI,CAAC;SAC3F,CAAC,CAAC;QAEH,QAAQ,CAAC,eAAe,CAAC,0CAAkC,EAAE;YAC3D,OAAO,EAAE,CAAC,IAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,IAAI,CAAC;SAC3F,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,QAAgC;QACpD,IAAI,CAAC,cAAc,GAAG,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAEhF,QAAQ,CAAC,iCAAiC,CAAC;YACzC,UAAU,EAAE,CAAC,MAAe,EAAE,EAAE;gBAC9B,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;gBACzC,OAAO,wBAAK,CAAC,GAAG,CACd,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,wBAAwB,EACrC,6CAA6B,CAAC,WAAW,CAC1C,CAAC,GAAG,EAAE;oBACL,IAAI,YAAY,CAAC,QAAQ,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"callHierarchy.contribution.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAQoC;AACpC,oFAA+E;AAC/E,0FAIgE;AAGhE,uCAAyF;AAE5E,QAAA,kCAAkC,GAAG;IAChD,EAAE,EAAE,8BAA8B;CACnC,CAAC;AAEW,QAAA,kCAAkC,GAAG;IAChD,EAAE,EAAE,8BAA8B;CACnC,CAAC;AAEW,QAAA,kCAAkC,GAAG;IAChD,EAAE,EAAE,8BAA8B;CACnC,CAAC;AAEF,MAAM,4BAA4B,GAAG,IAAI,+BAAa,CAAU,gCAAgC,EAAE,KAAK,CAAC,CAAC;AAGlG,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IASpC,gBAAgB,CAAC,QAAyB;QACxC,QAAQ,CAAC,eAAe,CAAC,0CAAkC,EAAE;YAC3D,OAAO,EAAE,CAAC,QAAa,EAAE,QAAkB,EAAE,EAAE,CAC7C,IAAI,CAAC,oBAAoB,CAAC,4BAA4B,CAAC,QAAQ,EAAE,QAAQ,CAAC;SAC7E,CAAC,CAAC;QAEH,QAAQ,CAAC,eAAe,CAAC,0CAAkC,EAAE;YAC3D,OAAO,EAAE,CAAC,IAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,IAAI,CAAC;SAC3F,CAAC,CAAC;QAEH,QAAQ,CAAC,eAAe,CAAC,0CAAkC,EAAE;YAC3D,OAAO,EAAE,CAAC,IAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,oBAAoB,CAAC,oBAAoB,CAAC,IAAI,CAAC;SAC3F,CAAC,CAAC;IACL,CAAC;IAED,qBAAqB,CAAC,QAAgC;QACpD,IAAI,CAAC,cAAc,GAAG,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAEhF,QAAQ,CAAC,iCAAiC,CAAC;YACzC,UAAU,EAAE,CAAC,MAAe,EAAE,EAAE;gBAC9B,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;gBACzC,OAAO,wBAAK,CAAC,GAAG,CACd,YAAY,CAAC,gBAAgB,EAC7B,YAAY,CAAC,wBAAwB,EACrC,6CAA6B,CAAC,WAAW,CAC1C,CAAC,GAAG,EAAE;oBACL,IAAI,YAAY,CAAC,QAAQ,EAAE,EAAE;wBAC3B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,6CAA6B,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;qBACrF;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAvCC;IAAC,IAAA,cAAS,EAAC,qCAAkB,CAAC;;oEAC2B;AAEzD;IAAC,IAAA,cAAS,EAAC,qCAAqB,CAAC;;uEAC8B;AAPpD,yBAAyB;IADrC,IAAA,yBAAM,EAAC,sCAAmB,EAAE,iCAAyB,CAAC;GAC1C,yBAAyB,CA0CrC;AA1CY,8DAAyB"}
|
|
@@ -118,12 +118,12 @@ let CallHierarchyService = class CallHierarchyService {
|
|
|
118
118
|
return model.resolveOutgoingCalls(item, ide_core_common_1.CancellationToken.None);
|
|
119
119
|
}
|
|
120
120
|
};
|
|
121
|
-
exports.CallHierarchyService = CallHierarchyService;
|
|
122
121
|
tslib_1.__decorate([
|
|
123
122
|
(0, di_1.Autowired)(types_1.IEditorDocumentModelService),
|
|
124
123
|
tslib_1.__metadata("design:type", Object)
|
|
125
124
|
], CallHierarchyService.prototype, "modelService", void 0);
|
|
126
|
-
|
|
125
|
+
CallHierarchyService = tslib_1.__decorate([
|
|
127
126
|
(0, di_1.Injectable)()
|
|
128
127
|
], CallHierarchyService);
|
|
128
|
+
exports.CallHierarchyService = CallHierarchyService;
|
|
129
129
|
//# sourceMappingURL=callHierarchy.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callHierarchy.service.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DASmC;AACnC,0FAOgE;AAGhE,iDAAoE;AAEpE,MAAM,EAAE,eAAe,EAAE,GAAG,wBAAM,CAAC;AAEnC;;;gGAGgG;AAChG,kJAAkJ;AAElJ,MAAa,kBAAkB;IAC7B,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,KAAiB,EACjB,QAAmB,EACnB,KAAwB;QAExB,MAAM,CAAC,QAAQ,CAAC,GAAG,6CAA6B,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,EAAE
|
|
1
|
+
{"version":3,"file":"callHierarchy.service.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ var MonacoCommandType;
|
|
|
30
30
|
(function (MonacoCommandType) {
|
|
31
31
|
MonacoCommandType[MonacoCommandType["ACTION"] = 0] = "ACTION";
|
|
32
32
|
MonacoCommandType[MonacoCommandType["COMMAND"] = 1] = "COMMAND";
|
|
33
|
-
})(MonacoCommandType
|
|
33
|
+
})(MonacoCommandType = exports.MonacoCommandType || (exports.MonacoCommandType = {}));
|
|
34
34
|
let MonacoCommandService = class MonacoCommandService {
|
|
35
35
|
constructor() {
|
|
36
36
|
this._onDidExecuteCommand = new ide_core_browser_1.Emitter();
|
|
@@ -81,7 +81,6 @@ let MonacoCommandService = class MonacoCommandService {
|
|
|
81
81
|
return Promise.reject(new Error(`command '${commandId}' not found`));
|
|
82
82
|
}
|
|
83
83
|
};
|
|
84
|
-
exports.MonacoCommandService = MonacoCommandService;
|
|
85
84
|
tslib_1.__decorate([
|
|
86
85
|
(0, di_1.Autowired)(ide_core_browser_1.ILogger),
|
|
87
86
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -98,9 +97,10 @@ tslib_1.__decorate([
|
|
|
98
97
|
(0, di_1.Autowired)(ide_core_browser_1.IReporterService),
|
|
99
98
|
tslib_1.__metadata("design:type", Object)
|
|
100
99
|
], MonacoCommandService.prototype, "reporterService", void 0);
|
|
101
|
-
|
|
100
|
+
MonacoCommandService = tslib_1.__decorate([
|
|
102
101
|
(0, di_1.Injectable)()
|
|
103
102
|
], MonacoCommandService);
|
|
103
|
+
exports.MonacoCommandService = MonacoCommandService;
|
|
104
104
|
let MonacoCommandRegistry = class MonacoCommandRegistry {
|
|
105
105
|
/**
|
|
106
106
|
* 校验 command id 是否是 monaco id
|
|
@@ -179,7 +179,6 @@ let MonacoCommandRegistry = class MonacoCommandRegistry {
|
|
|
179
179
|
}
|
|
180
180
|
}
|
|
181
181
|
};
|
|
182
|
-
exports.MonacoCommandRegistry = MonacoCommandRegistry;
|
|
183
182
|
tslib_1.__decorate([
|
|
184
183
|
(0, di_1.Autowired)(ide_core_browser_1.CommandRegistry),
|
|
185
184
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -196,9 +195,10 @@ tslib_1.__decorate([
|
|
|
196
195
|
(0, di_1.Autowired)(ide_core_browser_1.MonacoOverrideServiceRegistry),
|
|
197
196
|
tslib_1.__metadata("design:type", ide_core_browser_1.MonacoOverrideServiceRegistry)
|
|
198
197
|
], MonacoCommandRegistry.prototype, "overrideServiceRegistry", void 0);
|
|
199
|
-
|
|
198
|
+
MonacoCommandRegistry = tslib_1.__decorate([
|
|
200
199
|
(0, di_1.Injectable)()
|
|
201
200
|
], MonacoCommandRegistry);
|
|
201
|
+
exports.MonacoCommandRegistry = MonacoCommandRegistry;
|
|
202
202
|
let MonacoActionRegistry = MonacoActionRegistry_1 = class MonacoActionRegistry {
|
|
203
203
|
get globalInstantiationService() {
|
|
204
204
|
const codeEditorService = this.overrideServiceRegistry.getRegisteredService(ide_core_browser_1.ServiceNames.CODE_EDITOR_SERVICE);
|
|
@@ -347,7 +347,6 @@ let MonacoActionRegistry = MonacoActionRegistry_1 = class MonacoActionRegistry {
|
|
|
347
347
|
};
|
|
348
348
|
}
|
|
349
349
|
};
|
|
350
|
-
exports.MonacoActionRegistry = MonacoActionRegistry;
|
|
351
350
|
MonacoActionRegistry.COMMON_ACTIONS = new Map([
|
|
352
351
|
[ide_monaco_1.DELEGATE_COMMANDS.UNDO, ide_core_browser_1.EDITOR_COMMANDS.UNDO.id],
|
|
353
352
|
[ide_monaco_1.DELEGATE_COMMANDS.REDO, ide_core_browser_1.EDITOR_COMMANDS.REDO.id],
|
|
@@ -396,7 +395,8 @@ tslib_1.__decorate([
|
|
|
396
395
|
tslib_1.__metadata("design:type", Object),
|
|
397
396
|
tslib_1.__metadata("design:paramtypes", [])
|
|
398
397
|
], MonacoActionRegistry.prototype, "monacoCommands", null);
|
|
399
|
-
|
|
398
|
+
MonacoActionRegistry = MonacoActionRegistry_1 = tslib_1.__decorate([
|
|
400
399
|
(0, di_1.Injectable)()
|
|
401
400
|
], MonacoActionRegistry);
|
|
401
|
+
exports.MonacoActionRegistry = MonacoActionRegistry;
|
|
402
402
|
//# sourceMappingURL=command.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.service.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/command/command.service.ts"],"names":[],"mappings":";;;;;AAAA,qCAAqD;AACrD,iEAeoC;AACpC,qDAAyD;AACzD,8EAS0D;AAC1D,4EAAkE;AAClE,mFAA0F;AAI1F,uCAA8E;AAE9E;;GAEG;AACH,MAAM,kBAAkB,GAAG;IACzB,gCAAgC,EAAE,kCAAkC;IACpE,uBAAuB,EAAE,oBAAoB;IAC7C,6BAA6B,EAAE,0BAA0B;IACzD,kCAAkC,EAAE,8BAA8B;IAClE,wCAAwC,EAAE,qCAAqC;IAC/E,+BAA+B,EAAE,gCAAgC;CAClE,CAAC;AAEF;;;;GAIG;AACH,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,6DAAM,CAAA;IACN,+DAAO,CAAA;AACT,CAAC,EAHW,iBAAiB,
|
|
1
|
+
{"version":3,"file":"command.service.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/command/command.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,8 +72,8 @@ let TextmateRegistry = class TextmateRegistry {
|
|
|
72
72
|
return this.languageToConfig.get(languageId) || (() => ({}));
|
|
73
73
|
}
|
|
74
74
|
};
|
|
75
|
-
|
|
76
|
-
exports.TextmateRegistry = TextmateRegistry = tslib_1.__decorate([
|
|
75
|
+
TextmateRegistry = tslib_1.__decorate([
|
|
77
76
|
(0, di_1.Injectable)()
|
|
78
77
|
], TextmateRegistry);
|
|
78
|
+
exports.TextmateRegistry = TextmateRegistry;
|
|
79
79
|
//# sourceMappingURL=textmate-registry.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textmate-registry.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/tokenizer/textmate-registry.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;AAMlF,qCAA0C;AAC1C,+DAAgE;AAuBzD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QACI,oBAAe,GAAG,IAAI,GAAG,EAAqC,CAAC;QAC/D,qBAAgB,GAAG,IAAI,GAAG,EAA8C,CAAC;QACzE,sBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;IA2DzD,CAAC;IAzDC,0CAA0C;IAC1C,4BAA4B,CAAC,KAAa,EAAE,WAAsC;QAChF,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE
|
|
1
|
+
{"version":3,"file":"textmate-registry.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/tokenizer/textmate-registry.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;;AAMlF,qCAA0C;AAC1C,+DAAgE;AAuBzD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAAtB;QACI,oBAAe,GAAG,IAAI,GAAG,EAAqC,CAAC;QAC/D,qBAAgB,GAAG,IAAI,GAAG,EAA8C,CAAC;QACzE,sBAAiB,GAAG,IAAI,GAAG,EAAkB,CAAC;IA2DzD,CAAC;IAzDC,0CAA0C;IAC1C,4BAA4B,CAAC,KAAa,EAAE,WAAsC;QAChF,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;YACnC,IAAA,gCAAc,GAAE,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,sCAAsC,KAAK,uBAAuB,CAAC,CAAC,CAAC;SACtG;QACD,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QAE7C,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC,CAAC;IACJ,CAAC;IAED,WAAW,CAAC,KAAa;QACvB,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACzC,CAAC;IAED,8BAA8B,CAAC,UAAkB,EAAE,KAAa;QAC9D,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAChD,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE;YACrC,IAAA,gCAAc,GAAE,CAAC,IAAI,CACnB,IAAI,KAAK,CAAC,IAAI,UAAU,gCAAgC,aAAa,SAAS,KAAK,SAAS,CAAC,CAC9F,CAAC;SACH;QACD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAE9C,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,UAAkB;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAChD,CAAC;IAED,aAAa,CAAC,KAAa;QACzB,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE;YAC/C,IAAI,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE;gBAC7C,OAAO,GAAG,CAAC;aACZ;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,4BAA4B,CAAC,UAAkB,EAAE,SAA6C;QAC5F,IAAI,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;YACzC,4GAA4G;SAC7G;QACD,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAEjD,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC3C,CAAC,CAAC;IACJ,CAAC;IAED,uBAAuB,CAAC,UAAkB;QACxC,OAAO,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC;CACF,CAAA;AA9DY,gBAAgB;IAD5B,IAAA,eAAU,GAAE;GACA,gBAAgB,CA8D5B;AA9DY,4CAAgB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textmate-tokenizer.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/tokenizer/textmate-tokenizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAW,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAE,UAAU,EAAW,KAAK,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAM/C,qBAAa,cAAe,YAAW,MAAM,CAAC,SAAS,CAAC,MAAM;aAChC,SAAS,EAAE,YAAY;gBAAvB,SAAS,EAAE,YAAY;IAEnD,KAAK,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM;IAIhC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,OAAO;CAGhD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,qBAAa,iBAAkB,SAAQ,UAAW,YAAW,MAAM,CAAC,SAAS,CAAC,qBAAqB;IAO/F,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC;IAR7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAY;IAE1C,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAA0C;IACxF,SAAgB,sBAAsB,EAAE,KAAK,CAAC,MAAM,CAAC,CAA4C;gBAG9E,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,eAAe,EACxB,yBAAyB,CAAC,
|
|
1
|
+
{"version":3,"file":"textmate-tokenizer.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/tokenizer/textmate-tokenizer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAW,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAE,UAAU,EAAW,KAAK,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAM/C,qBAAa,cAAe,YAAW,MAAM,CAAC,SAAS,CAAC,MAAM;aAChC,SAAS,EAAE,YAAY;gBAAvB,SAAS,EAAE,YAAY;IAEnD,KAAK,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM;IAIhC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,GAAG,OAAO;CAGhD;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;;;;;OAMG;IACH,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,qBAAa,iBAAkB,SAAQ,UAAW,YAAW,MAAM,CAAC,SAAS,CAAC,qBAAqB;IAO/F,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,yBAAyB,CAAC;IAR7C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAY;IAE1C,OAAO,CAAC,QAAQ,CAAC,6BAA6B,CAA0C;IACxF,SAAgB,sBAAsB,EAAE,KAAK,CAAC,MAAM,CAAC,CAA4C;gBAG9E,OAAO,EAAE,QAAQ,EACjB,OAAO,EAAE,eAAe,EACxB,yBAAyB,CAAC,qBAAS;IAMtD,eAAe,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM;IAI1C,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC,kBAAkB;IA0CzF,QAAQ,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,cAAc,GAAG,MAAM,CAAC,SAAS,CAAC,WAAW;CAO7E"}
|
|
@@ -70,7 +70,7 @@ class TextMateTokenizer extends utils_1.Disposable {
|
|
|
70
70
|
const result = this.grammar.tokenizeLine(line, state.ruleStack);
|
|
71
71
|
return {
|
|
72
72
|
endState: new TokenizerState(result.ruleStack),
|
|
73
|
-
tokens: result.tokens.map((t) => ({
|
|
73
|
+
tokens: result.tokens.map((t) => (Object.assign(Object.assign({}, t), { scopes: t.scopes.join('\r\n') }))),
|
|
74
74
|
};
|
|
75
75
|
}
|
|
76
76
|
}
|