@opensumi/ide-editor 3.5.1-next-1731391210.0 → 3.5.1-next-1731636910.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.
- 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 +6 -3
- 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 +6 -3
- 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 +8 -3
- 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 +2 -3
- 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.js +38 -21
- 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 +6 -8
- 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 +6 -3
- 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 +1 -2
- 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 +1 -2
- 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 +2 -2
- 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 +11 -8
- package/lib/browser/preference/schema.js.map +1 -1
- package/lib/browser/preference/util.js +1 -2
- 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 +3 -3
- 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 +5 -2
- package/lib/browser/view/editor.react.js.map +1 -1
- package/lib/browser/view/react-hook.js +1 -2
- 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.js +10 -6
- 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.js +14 -14
- 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 +0 -1
- 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 +1 -2
- package/lib/common/utils.js.map +1 -1
- package/package.json +14 -14
- package/src/browser/quick-open/workspace-symbol-quickopen.ts +1 -1
- package/src/browser/tab.view.tsx +3 -3
package/lib/browser/index.js
CHANGED
|
@@ -164,10 +164,10 @@ let EditorModule = class EditorModule extends ide_core_browser_1.BrowserModule {
|
|
|
164
164
|
this.contributionProvider = types_2.BrowserEditorContribution;
|
|
165
165
|
}
|
|
166
166
|
};
|
|
167
|
-
EditorModule =
|
|
167
|
+
exports.EditorModule = EditorModule;
|
|
168
|
+
exports.EditorModule = EditorModule = tslib_1.__decorate([
|
|
168
169
|
(0, di_1.Injectable)()
|
|
169
170
|
], EditorModule);
|
|
170
|
-
exports.EditorModule = EditorModule;
|
|
171
171
|
let EditorClientAppContribution = class EditorClientAppContribution {
|
|
172
172
|
async initialize() {
|
|
173
173
|
for (const contribution of this.contributions.getContributions()) {
|
|
@@ -194,6 +194,7 @@ let EditorClientAppContribution = class EditorClientAppContribution {
|
|
|
194
194
|
this.workbenchEditorService.prepareContextKeyService();
|
|
195
195
|
}
|
|
196
196
|
};
|
|
197
|
+
exports.EditorClientAppContribution = EditorClientAppContribution;
|
|
197
198
|
tslib_1.__decorate([
|
|
198
199
|
(0, di_1.Autowired)(),
|
|
199
200
|
tslib_1.__metadata("design:type", common_1.ResourceService)
|
|
@@ -230,8 +231,7 @@ tslib_1.__decorate([
|
|
|
230
231
|
(0, di_1.Autowired)(types_2.BrowserEditorContribution),
|
|
231
232
|
tslib_1.__metadata("design:type", Object)
|
|
232
233
|
], EditorClientAppContribution.prototype, "contributions", void 0);
|
|
233
|
-
EditorClientAppContribution = tslib_1.__decorate([
|
|
234
|
+
exports.EditorClientAppContribution = EditorClientAppContribution = tslib_1.__decorate([
|
|
234
235
|
(0, ide_core_browser_1.Domain)(ide_core_browser_1.ClientAppContribution)
|
|
235
236
|
], EditorClientAppContribution);
|
|
236
|
-
exports.EditorClientAppContribution = EditorClientAppContribution;
|
|
237
237
|
//# sourceMappingURL=index.js.map
|
package/lib/browser/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/browser/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-collection.js","sourceRoot":"","sources":["../../../src/browser/language/diagnostic-collection.ts"],"names":[],"mappings":";;;;AAAA,+DAA0F;AAC1F,qEAA+C;AAC/C,4EAAwE;AAExE,yCAAqF;AAKrF,MAAa,0BAA0B;IAIrC,YAA+B,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QAHxB,gBAAW,GAAG,IAAI,GAAG,EAA8C,CAAC;QACpE,cAAS,GAAG,IAAI,sCAAoB,EAAE,CAAC;IAEZ,CAAC;IAE/C,OAAO;QACL,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC9C,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;IACpD,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,WAAyB;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC3C,IAAI,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"diagnostic-collection.js","sourceRoot":"","sources":["../../../src/browser/language/diagnostic-collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,6 +59,7 @@ let LanguageStatusContribution = class LanguageStatusContribution extends ide_co
|
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
};
|
|
62
|
+
exports.LanguageStatusContribution = LanguageStatusContribution;
|
|
62
63
|
tslib_1.__decorate([
|
|
63
64
|
(0, di_1.Autowired)(ide_core_browser_1.IStatusBarService),
|
|
64
65
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -71,8 +72,7 @@ tslib_1.__decorate([
|
|
|
71
72
|
(0, di_1.Autowired)(common_1.ILanguageStatusService),
|
|
72
73
|
tslib_1.__metadata("design:type", Object)
|
|
73
74
|
], LanguageStatusContribution.prototype, "languageStatusService", void 0);
|
|
74
|
-
LanguageStatusContribution = tslib_1.__decorate([
|
|
75
|
+
exports.LanguageStatusContribution = LanguageStatusContribution = tslib_1.__decorate([
|
|
75
76
|
(0, ide_core_browser_1.Domain)(ide_core_browser_1.ClientAppContribution)
|
|
76
77
|
], LanguageStatusContribution);
|
|
77
|
-
exports.LanguageStatusContribution = LanguageStatusContribution;
|
|
78
78
|
//# sourceMappingURL=language-status.contribution.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language-status.contribution.js","sourceRoot":"","sources":["../../../src/browser/language/language-status.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAQoC;AAEpC,yCAAwG;AACxG,8CAA2E;AAGpE,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,+BAAY;IAU1D,UAAU;QACR,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACtD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,6CAAqC,EAAE,CAAC,CAAC,EAAE,EAAE;YAC5D,MAAM,aAAa,GAAG,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC;YAChE,IAAI,aAAa,IAAI,aAAa,CAAC,UAAU,IAAI,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"language-status.contribution.js","sourceRoot":"","sources":["../../../src/browser/language/language-status.contribution.ts"],"names":[],"mappings":";;;;AAAA,qCAAyC;AACzC,iEAQoC;AAEpC,yCAAwG;AACxG,8CAA2E;AAGpE,IAAM,0BAA0B,GAAhC,MAAM,0BAA2B,SAAQ,+BAAY;IAU1D,UAAU;QACR,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,CAAC,GAAG,EAAE;YACtD,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,6CAAqC,EAAE,CAAC,CAAC,EAAE,EAAE;YAC5D,MAAM,aAAa,GAAG,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC;YAChE,IAAI,aAAa,IAAI,aAAa,CAAC,UAAU,IAAI,aAAa,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;gBACjG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC;YACvE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAES,oBAAoB,CAAC,MAAsB;QACnD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,+BAA+B,CAAC,CAAC;YAC9D,OAAO;QACT,CAAC;QAED,MAAM,aAAa,GAAG,MAAM,CAAC,oBAAoB,CAAC;QAElD,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,GAAG,GAAG,IAAI,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,aAAa,CAAC,cAAc,EAAE,CAAC,CAAC;YACzF,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;gBACf,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,+BAA+B,EAAE;oBACzD,IAAI,EAAE,IAAA,2BAAQ,EAAC,8BAA8B,CAAC;oBAC9C,SAAS,EAAE,qCAAkB,CAAC,KAAK;oBACnC,IAAI,EAAE,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC;oBACrC,cAAc;oBACd,QAAQ,EAAE,GAAG;oBACb,aAAa,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;wBAClC,KAAK,EAAE,MAAM,CAAC,KAAK;wBACnB,IAAI,EAAE,MAAM,CAAC,IAAI;wBACjB,OAAO,EAAE,MAAM,CAAC,OAAO;qBACxB,CAAC,CAAC;oBACH,uBAAuB;oBACvB,OAAO,EAAE,GAAG,EAAE,GAAE,CAAC;iBAClB,CAAC,CAAC;YACL,CAAC;QACH,CAAC;IACH,CAAC;IACO,qBAAqB,CAAC,MAAyB;QACrD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxB,OAAO;QACT,CAAC;QACD,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;QACvB,QAAQ,KAAK,CAAC,QAAQ,EAAE,CAAC;YACvB,KAAK,2BAAQ,CAAC,KAAK;gBACjB,OAAO,kBAAkB,CAAC;YAC5B,KAAK,2BAAQ,CAAC,OAAO;gBACnB,OAAO,gBAAgB,CAAC;YAC1B;gBACE,OAAO,YAAY,CAAC;QACxB,CAAC;IACH,CAAC;CACF,CAAA;AAjEY,gEAA0B;AAEpB;IADhB,IAAA,cAAS,EAAC,oCAAiB,CAAC;;6DACiB;AAG7B;IADhB,IAAA,cAAS,GAAE;sCAC6B,+BAAsB;0EAAC;AAG/C;IADhB,IAAA,cAAS,EAAC,+BAAsB,CAAC;;yEAC6B;qCARpD,0BAA0B;IADtC,IAAA,yBAAM,EAAC,wCAAqB,CAAC;GACjB,0BAA0B,CAiEtC"}
|
|
@@ -27,8 +27,8 @@ let LanguageStatusService = class LanguageStatusService {
|
|
|
27
27
|
});
|
|
28
28
|
}
|
|
29
29
|
};
|
|
30
|
-
LanguageStatusService =
|
|
30
|
+
exports.LanguageStatusService = LanguageStatusService;
|
|
31
|
+
exports.LanguageStatusService = LanguageStatusService = tslib_1.__decorate([
|
|
31
32
|
(0, di_1.Injectable)()
|
|
32
33
|
], LanguageStatusService);
|
|
33
|
-
exports.LanguageStatusService = LanguageStatusService;
|
|
34
34
|
//# sourceMappingURL=language-status.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language-status.service.js","sourceRoot":"","sources":["../../../src/browser/language/language-status.service.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+DAAwE;AACxE,uHAAoH;AAKpH,MAAM,EAAE,OAAO,EAAE,GAAG,yBAAO,CAAC;AAGrB,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QACY,cAAS,GAAG,IAAI,iDAAuB,EAAmB,CAAC;QAEnE,gBAAW,GAAe,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;IAkBhE,CAAC;IAhBC,SAAS,CAAC,MAAuB;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,iBAAiB,CAAC,KAAiB;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI,GAAG,GAAG,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;YAClC,IAAI,GAAG,KAAK,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"language-status.service.js","sourceRoot":"","sources":["../../../src/browser/language/language-status.service.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,+DAAwE;AACxE,uHAAoH;AAKpH,MAAM,EAAE,OAAO,EAAE,GAAG,yBAAO,CAAC;AAGrB,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAA3B;QACY,cAAS,GAAG,IAAI,iDAAuB,EAAmB,CAAC;QAEnE,gBAAW,GAAe,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;IAkBhE,CAAC;IAhBC,SAAS,CAAC,MAAuB;QAC/B,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,iBAAiB,CAAC,KAAiB;QACjC,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI,GAAG,GAAG,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;YAClC,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;gBACd,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;YACpC,CAAC;YACD,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC;gBACd,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5B,CAAC;YACD,OAAO,GAAG,CAAC;QACb,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AArBY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,eAAU,GAAE;GACA,qBAAqB,CAqBjC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.LanguageService =
|
|
3
|
+
exports.LanguageService = void 0;
|
|
4
|
+
exports.reviveMarker = reviveMarker;
|
|
4
5
|
const tslib_1 = require("tslib");
|
|
5
6
|
const di_1 = require("@opensumi/di");
|
|
6
7
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
@@ -61,7 +62,6 @@ function reviveMarker(marker) {
|
|
|
61
62
|
}
|
|
62
63
|
return monacoMarker;
|
|
63
64
|
}
|
|
64
|
-
exports.reviveMarker = reviveMarker;
|
|
65
65
|
let LanguageService = class LanguageService {
|
|
66
66
|
constructor() {
|
|
67
67
|
this.markers = new Map();
|
|
@@ -144,6 +144,7 @@ let LanguageService = class LanguageService {
|
|
|
144
144
|
}
|
|
145
145
|
}
|
|
146
146
|
};
|
|
147
|
+
exports.LanguageService = LanguageService;
|
|
147
148
|
tslib_1.__decorate([
|
|
148
149
|
(0, di_1.Autowired)(),
|
|
149
150
|
tslib_1.__metadata("design:type", ide_core_common_1.MarkerManager)
|
|
@@ -152,9 +153,8 @@ tslib_1.__decorate([
|
|
|
152
153
|
(0, di_1.Autowired)(tokenizer_1.ITextmateTokenizer),
|
|
153
154
|
tslib_1.__metadata("design:type", Object)
|
|
154
155
|
], LanguageService.prototype, "textmateService", void 0);
|
|
155
|
-
LanguageService = tslib_1.__decorate([
|
|
156
|
+
exports.LanguageService = LanguageService = tslib_1.__decorate([
|
|
156
157
|
(0, di_1.Injectable)(),
|
|
157
158
|
tslib_1.__metadata("design:paramtypes", [])
|
|
158
159
|
], LanguageService);
|
|
159
|
-
exports.LanguageService = LanguageService;
|
|
160
160
|
//# sourceMappingURL=language.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language.service.js","sourceRoot":"","sources":["../../../src/browser/language/language.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"language.service.js","sourceRoot":"","sources":["../../../src/browser/language/language.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ let BreadCrumbsMenuService = class BreadCrumbsMenuService {
|
|
|
19
19
|
});
|
|
20
20
|
}
|
|
21
21
|
};
|
|
22
|
+
exports.BreadCrumbsMenuService = BreadCrumbsMenuService;
|
|
22
23
|
tslib_1.__decorate([
|
|
23
24
|
(0, di_1.Autowired)(next_1.AbstractContextMenuService),
|
|
24
25
|
tslib_1.__metadata("design:type", next_1.AbstractContextMenuService)
|
|
@@ -27,8 +28,7 @@ tslib_1.__decorate([
|
|
|
27
28
|
(0, di_1.Autowired)(next_1.ICtxMenuRenderer),
|
|
28
29
|
tslib_1.__metadata("design:type", next_1.ICtxMenuRenderer)
|
|
29
30
|
], BreadCrumbsMenuService.prototype, "ctxMenuRenderer", void 0);
|
|
30
|
-
BreadCrumbsMenuService = tslib_1.__decorate([
|
|
31
|
+
exports.BreadCrumbsMenuService = BreadCrumbsMenuService = tslib_1.__decorate([
|
|
31
32
|
(0, di_1.Injectable)()
|
|
32
33
|
], BreadCrumbsMenuService);
|
|
33
|
-
exports.BreadCrumbsMenuService = BreadCrumbsMenuService;
|
|
34
34
|
//# sourceMappingURL=breadcrumbs.menus.js.map
|
|
@@ -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;AArBY,wDAAsB;AAEhB;IADhB,IAAA,cAAS,EAAC,iCAA0B,CAAC;sCACL,iCAA0B;8DAAC;AAG3C;IADhB,IAAA,cAAS,EAAC,uBAAgB,CAAC;sCACM,uBAAgB;+DAAC;iCALxC,sBAAsB;IADlC,IAAA,eAAU,GAAE;GACA,sBAAsB,CAqBlC"}
|
|
@@ -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,6 +31,7 @@ let EditorActionRegistryImpl = class EditorActionRegistryImpl extends ide_core_b
|
|
|
31
31
|
return this._cachedMenus.get(key);
|
|
32
32
|
}
|
|
33
33
|
};
|
|
34
|
+
exports.EditorActionRegistryImpl = EditorActionRegistryImpl;
|
|
34
35
|
tslib_1.__decorate([
|
|
35
36
|
(0, di_1.Autowired)(ide_core_browser_1.IContextKeyService),
|
|
36
37
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -43,8 +44,7 @@ tslib_1.__decorate([
|
|
|
43
44
|
(0, di_1.Autowired)(ide_core_browser_1.ILogger),
|
|
44
45
|
tslib_1.__metadata("design:type", Object)
|
|
45
46
|
], EditorActionRegistryImpl.prototype, "logger", void 0);
|
|
46
|
-
EditorActionRegistryImpl = tslib_1.__decorate([
|
|
47
|
+
exports.EditorActionRegistryImpl = EditorActionRegistryImpl = tslib_1.__decorate([
|
|
47
48
|
(0, di_1.Injectable)()
|
|
48
49
|
], 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,CAAC;YAChC,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;QACpC,CAAC;QACD,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;IACrC,CAAC;CACF,CAAA;AAnCY,4DAAwB;AAI3B;IADP,IAAA,cAAS,EAAC,qCAAkB,CAAC;;mEACgB;AAG7B;IADhB,IAAA,cAAS,EAAC,iCAA0B,CAAC;sCACR,iCAA0B;6DAAC;AAGzD;IADC,IAAA,cAAS,EAAC,0BAAO,CAAC;;wDACH;mCAVL,wBAAwB;IADpC,IAAA,eAAU,GAAE;GACA,wBAAwB,CAmCpC"}
|
|
@@ -71,6 +71,7 @@ let OpenTypeMenuContribution = class OpenTypeMenuContribution extends ide_core_c
|
|
|
71
71
|
});
|
|
72
72
|
}
|
|
73
73
|
};
|
|
74
|
+
exports.OpenTypeMenuContribution = OpenTypeMenuContribution;
|
|
74
75
|
tslib_1.__decorate([
|
|
75
76
|
(0, di_1.Autowired)(types_1.WorkbenchEditorService),
|
|
76
77
|
tslib_1.__metadata("design:type", workbench_editor_service_1.WorkbenchEditorServiceImpl)
|
|
@@ -79,9 +80,8 @@ tslib_1.__decorate([
|
|
|
79
80
|
(0, di_1.Autowired)(next_1.IMenuRegistry),
|
|
80
81
|
tslib_1.__metadata("design:type", next_1.IMenuRegistry)
|
|
81
82
|
], OpenTypeMenuContribution.prototype, "menuRegistry", void 0);
|
|
82
|
-
OpenTypeMenuContribution = tslib_1.__decorate([
|
|
83
|
+
exports.OpenTypeMenuContribution = OpenTypeMenuContribution = tslib_1.__decorate([
|
|
83
84
|
(0, di_helper_1.Domain)(ide_core_common_1.CommandContribution, next_1.MenuContribution),
|
|
84
85
|
tslib_1.__metadata("design:paramtypes", [])
|
|
85
86
|
], 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,6 +36,7 @@ let TabTitleMenuService = class TabTitleMenuService {
|
|
|
36
36
|
});
|
|
37
37
|
}
|
|
38
38
|
};
|
|
39
|
+
exports.TabTitleMenuService = TabTitleMenuService;
|
|
39
40
|
tslib_1.__decorate([
|
|
40
41
|
(0, di_1.Autowired)(next_1.AbstractContextMenuService),
|
|
41
42
|
tslib_1.__metadata("design:type", next_1.AbstractContextMenuService)
|
|
@@ -48,8 +49,7 @@ tslib_1.__decorate([
|
|
|
48
49
|
(0, di_1.Autowired)(ide_core_browser_1.IContextKeyService),
|
|
49
50
|
tslib_1.__metadata("design:type", Object)
|
|
50
51
|
], TabTitleMenuService.prototype, "contextKeyService", void 0);
|
|
51
|
-
TabTitleMenuService = tslib_1.__decorate([
|
|
52
|
+
exports.TabTitleMenuService = TabTitleMenuService = tslib_1.__decorate([
|
|
52
53
|
(0, di_1.Injectable)()
|
|
53
54
|
], 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,CAAC;YACjC,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;QAC9F,CAAC;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;AA3CY,kDAAmB;AAE9B;IADC,IAAA,cAAS,EAAC,iCAA0B,CAAC;sCACtB,iCAA0B;2DAAC;AAG3C;IADC,IAAA,cAAS,EAAC,uBAAgB,CAAC;sCACX,uBAAgB;4DAAC;AAGlC;IADC,IAAA,cAAS,EAAC,qCAAkB,CAAC;;8DACQ;8BAR3B,mBAAmB;IAD/B,IAAA,eAAU,GAAE;GACA,mBAAmB,CA2C/B"}
|
|
@@ -137,10 +137,10 @@ let MergeConflictParser = MergeConflictParser_1 = class MergeConflictParser exte
|
|
|
137
137
|
this._conflictRangeCaches.clear();
|
|
138
138
|
}
|
|
139
139
|
};
|
|
140
|
-
MergeConflictParser =
|
|
140
|
+
exports.MergeConflictParser = MergeConflictParser;
|
|
141
|
+
exports.MergeConflictParser = MergeConflictParser = MergeConflictParser_1 = tslib_1.__decorate([
|
|
141
142
|
(0, di_1.Injectable)()
|
|
142
143
|
], 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 = useMergeConflictModel;
|
|
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,5 +46,4 @@ function useMergeConflictModel(uri) {
|
|
|
46
46
|
canNavigate: conflictsCount > 0,
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
|
-
exports.useMergeConflictModel = useMergeConflictModel;
|
|
50
49
|
//# 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":";;AAUA,sDAmDC;;AA7DD,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,CAAC;YAChB,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,CAAC;oBACV,oBAAoB,CAAC,IAAI,CAAC,CAAC;gBAC7B,CAAC;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;QACJ,CAAC;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"}
|
|
@@ -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,EAAS,qBAAqB,EAAE,CAAC;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,6 +47,7 @@ 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;
|
|
50
51
|
tslib_1.__decorate([
|
|
51
52
|
(0, di_1.Autowired)(conflict_parser_1.MergeConflictParser),
|
|
52
53
|
tslib_1.__metadata("design:type", conflict_parser_1.MergeConflictParser)
|
|
@@ -59,8 +60,7 @@ tslib_1.__decorate([
|
|
|
59
60
|
(0, di_1.Autowired)(ide_overlay_1.IMessageService),
|
|
60
61
|
tslib_1.__metadata("design:type", Object)
|
|
61
62
|
], MergeConflictService.prototype, "messageService", void 0);
|
|
62
|
-
MergeConflictService = tslib_1.__decorate([
|
|
63
|
+
exports.MergeConflictService = MergeConflictService = tslib_1.__decorate([
|
|
63
64
|
(0, di_1.Injectable)()
|
|
64
65
|
], 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,CAAC;YACtB,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAC;YACrE,OAAO;QACT,CAAC;aAAM,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,CAAC;YACzC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,2CAA2C,CAAC,CAAC;YACzE,OAAO;QACT,CAAC;aAAM,IAAI,CAAC,gBAAgB,CAAC,KAAK,EAAE,CAAC;YACnC,kBAAkB;YAClB,OAAO;QACT,CAAC;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;AAtDY,oDAAoB;AAE/B;IADC,IAAA,cAAS,EAAC,qCAAmB,CAAC;sCACvB,qCAAmB;oDAAC;AAGX;IADhB,IAAA,cAAS,EAAC,8BAAsB,CAAC;sCACF,8BAAsB;2DAAC;AAGtC;IADhB,IAAA,cAAS,EAAC,6BAAe,CAAC;;4DACsB;+BARtC,oBAAoB;IADhC,IAAA,eAAU,GAAE;GACA,oBAAoB,CAsDhC"}
|
|
@@ -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 = "merge-conflict.ai.accept";
|
|
37
|
+
const REVERT = "merge-conflict.ai.revert";
|
|
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,6BAAgC,CAAC;IAC7C,MAAM,MAAM,6BAAgC,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 = 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,0BAAV,UAAU,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,CAAC;YAClB,MAAM,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,kBAAkB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QAC1F,CAAC;aAAM,CAAC;YACN,MAAM,cAAc,CAAC,cAAc,CAAC,0CAAuB,CAAC,aAAa,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;QACrF,CAAC;QACD,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC,EAAE,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC;IAEzB,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;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,CAAC;oBAC9E,cAAc,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;gBAC9C,CAAC;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;
|
|
35
36
|
tslib_1.__decorate([
|
|
36
37
|
(0, di_1.Autowired)(),
|
|
37
38
|
tslib_1.__metadata("design:type", merge_editor_provider_1.MergeEditorResourceProvider)
|
|
38
39
|
], MergeEditorContribution.prototype, "mergeEditorResourceProvider", void 0);
|
|
39
|
-
MergeEditorContribution = tslib_1.__decorate([
|
|
40
|
+
exports.MergeEditorContribution = MergeEditorContribution = tslib_1.__decorate([
|
|
40
41
|
(0, ide_core_browser_1.Domain)(types_1.BrowserEditorContribution)
|
|
41
42
|
], 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,CAAC;oBAChC,OAAO,KAAK,CAAC;gBACf,CAAC;gBACD,4BAA4B;gBAC5B,OAAO,IAAI,CAAC;YACd,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA5BY,0DAAuB;AAEjB;IADhB,IAAA,cAAS,GAAE;sCACkC,mDAA2B;4EAAC;kCAF/D,uBAAuB;IADnC,IAAA,yBAAM,EAAC,iCAAyB,CAAC;GACrB,uBAAuB,CA4BnC"}
|
|
@@ -48,6 +48,7 @@ let MergeEditorResourceProvider = class MergeEditorResourceProvider extends ide_
|
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
};
|
|
51
|
+
exports.MergeEditorResourceProvider = MergeEditorResourceProvider;
|
|
51
52
|
tslib_1.__decorate([
|
|
52
53
|
(0, di_1.Autowired)(ide_core_browser_1.LabelService),
|
|
53
54
|
tslib_1.__metadata("design:type", ide_core_browser_1.LabelService)
|
|
@@ -56,8 +57,7 @@ tslib_1.__decorate([
|
|
|
56
57
|
(0, di_1.Autowired)(merge_editor_service_1.MergeEditorService),
|
|
57
58
|
tslib_1.__metadata("design:type", merge_editor_service_1.MergeEditorService)
|
|
58
59
|
], MergeEditorResourceProvider.prototype, "mergeEditorService", void 0);
|
|
59
|
-
MergeEditorResourceProvider = tslib_1.__decorate([
|
|
60
|
+
exports.MergeEditorResourceProvider = MergeEditorResourceProvider = tslib_1.__decorate([
|
|
60
61
|
(0, di_1.Injectable)()
|
|
61
62
|
], 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,CAAC;YACH,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;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;IAEM,mBAAmB,CAAC,QAAwB,EAAE,eAAmC;QACtF,MAAM,EAAE,YAAY,EAAE,GAAG,QAAQ,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAEvD,IAAI,CAAC;YACH,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;QACd,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,KAAK,CAAC,qCAAqC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC;CACF,CAAA;AA/CY,kEAA2B;AAIrB;IADhB,IAAA,cAAS,EAAC,+BAAY,CAAC;sCACO,+BAAY;iEAAC;AAG3B;IADhB,IAAA,cAAS,EAAC,yCAAkB,CAAC;sCACO,yCAAkB;uEAAC;sCAP7C,2BAA2B;IADvC,IAAA,eAAU,GAAE;GACA,2BAA2B,CA+CvC"}
|
|
@@ -43,6 +43,7 @@ let CallHierarchyContribution = class CallHierarchyContribution {
|
|
|
43
43
|
});
|
|
44
44
|
}
|
|
45
45
|
};
|
|
46
|
+
exports.CallHierarchyContribution = CallHierarchyContribution;
|
|
46
47
|
tslib_1.__decorate([
|
|
47
48
|
(0, di_1.Autowired)(ide_core_browser_1.IContextKeyService),
|
|
48
49
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -51,8 +52,7 @@ tslib_1.__decorate([
|
|
|
51
52
|
(0, di_1.Autowired)(callHierarchy_1.ICallHierarchyService),
|
|
52
53
|
tslib_1.__metadata("design:type", Object)
|
|
53
54
|
], CallHierarchyContribution.prototype, "callHierarchyService", void 0);
|
|
54
|
-
CallHierarchyContribution = tslib_1.__decorate([
|
|
55
|
+
exports.CallHierarchyContribution = CallHierarchyContribution = tslib_1.__decorate([
|
|
55
56
|
(0, ide_core_browser_1.Domain)(ide_core_browser_1.CommandContribution, types_1.BrowserEditorContribution)
|
|
56
57
|
], 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,CAAC;wBAC5B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,6CAA6B,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;oBACtF,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA1CY,8DAAyB;AAIjB;IADlB,IAAA,cAAS,EAAC,qCAAkB,CAAC;;oEAC2B;AAGtC;IADlB,IAAA,cAAS,EAAC,qCAAqB,CAAC;;uEAC8B;oCAPpD,yBAAyB;IADrC,IAAA,yBAAM,EAAC,sCAAmB,EAAE,iCAAyB,CAAC;GAC1C,yBAAyB,CA0CrC"}
|