@opensumi/ide-editor 2.27.3-next-1711507853.0 → 2.27.3-next-1711612363.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/decoration-applier.d.ts +1 -1
- package/lib/browser/decoration-applier.d.ts.map +1 -1
- package/lib/browser/decoration-applier.js +0 -1
- package/lib/browser/decoration-applier.js.map +1 -1
- package/lib/browser/diff/compare.d.ts +2 -1
- package/lib/browser/diff/compare.d.ts.map +1 -1
- package/lib/browser/diff/compare.js +26 -4
- package/lib/browser/diff/compare.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 +1 -1
- package/lib/browser/doc-model/editor-document-model.js.map +1 -1
- package/lib/browser/doc-model/override.d.ts +1 -1
- package/lib/browser/doc-model/override.d.ts.map +1 -1
- package/lib/browser/doc-model/saveParticipants.d.ts.map +1 -1
- package/lib/browser/doc-model/saveParticipants.js +2 -2
- package/lib/browser/doc-model/saveParticipants.js.map +1 -1
- package/lib/browser/doc-model/types.d.ts +1 -1
- package/lib/browser/doc-model/types.d.ts.map +1 -1
- package/lib/browser/editor-collection.service.d.ts +6 -5
- package/lib/browser/editor-collection.service.d.ts.map +1 -1
- package/lib/browser/editor-collection.service.js +10 -4
- package/lib/browser/editor-collection.service.js.map +1 -1
- package/lib/browser/editor.contribution.d.ts +2 -0
- package/lib/browser/editor.contribution.d.ts.map +1 -1
- package/lib/browser/editor.contribution.js +35 -1
- package/lib/browser/editor.contribution.js.map +1 -1
- package/lib/browser/editor.decoration.service.d.ts +1 -1
- package/lib/browser/editor.decoration.service.d.ts.map +1 -1
- package/lib/browser/editor.decoration.service.js.map +1 -1
- package/lib/browser/editor.module.less +49 -3
- package/lib/browser/editor.override.d.ts +2 -2
- package/lib/browser/editor.override.d.ts.map +1 -1
- package/lib/browser/editor.override.js +8 -11
- package/lib/browser/editor.override.js.map +1 -1
- package/lib/browser/feature.d.ts +1 -1
- package/lib/browser/format/formatterSelect.d.ts +1 -1
- package/lib/browser/format/formatterSelect.d.ts.map +1 -1
- package/lib/browser/format/formatterSelect.js.map +1 -1
- package/lib/browser/language/diagnostic-collection.d.ts +4 -3
- package/lib/browser/language/diagnostic-collection.d.ts.map +1 -1
- package/lib/browser/language/diagnostic-collection.js +5 -6
- package/lib/browser/language/diagnostic-collection.js.map +1 -1
- package/lib/browser/language/language.service.d.ts +1 -1
- package/lib/browser/language/language.service.d.ts.map +1 -1
- package/lib/browser/language/language.service.js.map +1 -1
- package/lib/browser/menu/editor.context.d.ts.map +1 -1
- package/lib/browser/menu/editor.context.js +1 -1
- package/lib/browser/menu/editor.context.js.map +1 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.d.ts.map +1 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js +60 -1
- package/lib/browser/merge-editor/MergeEditorFloatComponents.js.map +1 -1
- package/lib/browser/merge-editor/merge-editor.contribution.d.ts +0 -1
- package/lib/browser/merge-editor/merge-editor.contribution.d.ts.map +1 -1
- package/lib/browser/merge-editor/merge-editor.contribution.js +2 -6
- package/lib/browser/merge-editor/merge-editor.contribution.js.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts +1 -3
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/callHierarchy/callHierarchy.service.js.map +1 -1
- package/lib/browser/monaco-contrib/command/command.service.d.ts +1 -1
- package/lib/browser/monaco-contrib/command/command.service.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/command/command.service.js +1 -1
- package/lib/browser/monaco-contrib/command/command.service.js.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate-tokenizer.d.ts +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate-tokenizer.d.ts.map +1 -1
- package/lib/browser/monaco-contrib/tokenizer/textmate-tokenizer.js.map +1 -1
- package/lib/browser/preference/converter.d.ts.map +1 -1
- package/lib/browser/preference/converter.js +70 -2
- package/lib/browser/preference/converter.js.map +1 -1
- package/lib/browser/preference/schema.d.ts +18 -0
- package/lib/browser/preference/schema.d.ts.map +1 -1
- package/lib/browser/preference/schema.js +86 -19
- package/lib/browser/preference/schema.js.map +1 -1
- package/lib/browser/quick-open/go-to-line.d.ts +1 -1
- package/lib/browser/quick-open/go-to-line.d.ts.map +1 -1
- package/lib/browser/quick-open/go-to-line.js +1 -1
- package/lib/browser/quick-open/go-to-line.js.map +1 -1
- package/lib/browser/types.d.ts +1 -1
- package/lib/browser/types.d.ts.map +1 -1
- package/lib/browser/workbench-editor.service.d.ts.map +1 -1
- package/lib/browser/workbench-editor.service.js +4 -1
- package/lib/browser/workbench-editor.service.js.map +1 -1
- package/lib/common/language.d.ts +1 -1
- package/lib/common/language.d.ts.map +1 -1
- package/lib/common/language.js.map +1 -1
- package/package.json +14 -14
- package/src/browser/decoration-applier.ts +1 -2
- package/src/browser/diff/compare.ts +38 -21
- package/src/browser/doc-model/editor-document-model.ts +2 -1
- package/src/browser/doc-model/override.ts +1 -1
- package/src/browser/doc-model/saveParticipants.ts +3 -5
- package/src/browser/doc-model/types.ts +1 -1
- package/src/browser/editor-collection.service.ts +10 -6
- package/src/browser/editor.contribution.ts +37 -1
- package/src/browser/editor.decoration.service.ts +1 -1
- package/src/browser/editor.module.less +49 -3
- package/src/browser/editor.override.ts +10 -13
- package/src/browser/format/formatterSelect.ts +3 -3
- package/src/browser/language/diagnostic-collection.ts +8 -10
- package/src/browser/language/language.service.ts +1 -1
- package/src/browser/menu/editor.context.ts +1 -1
- package/src/browser/merge-editor/MergeEditorFloatComponents.tsx +101 -4
- package/src/browser/merge-editor/merge-editor.contribution.ts +4 -8
- package/src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts +1 -2
- package/src/browser/monaco-contrib/command/command.service.ts +2 -2
- package/src/browser/monaco-contrib/tokenizer/textmate-tokenizer.ts +1 -1
- package/src/browser/preference/converter.ts +76 -4
- package/src/browser/preference/schema.ts +93 -18
- package/src/browser/quick-open/go-to-line.ts +1 -1
- package/src/browser/types.ts +1 -1
- package/src/browser/view/topPadding.ts +1 -1
- package/src/browser/workbench-editor.service.ts +3 -1
- package/src/common/language.ts +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
|
+
import * as monaco from '@opensumi/ide-monaco';
|
|
1
2
|
import { ITextModel } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
2
3
|
import { FormattingMode } from '@opensumi/monaco-editor-core/esm/vs/editor/contrib/format/browser/format';
|
|
3
|
-
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
4
4
|
export declare class FormattingSelector {
|
|
5
5
|
private quickPickService;
|
|
6
6
|
private preferenceService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatterSelect.d.ts","sourceRoot":"","sources":["../../../src/browser/format/formatterSelect.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"formatterSelect.d.ts","sourceRoot":"","sources":["../../../src/browser/format/formatterSelect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,mDAAmD,CAAC;AAC/E,OAAO,EAAE,cAAc,EAAE,MAAM,0EAA0E,CAAC;AAM1G,qBACa,kBAAkB;IAE7B,OAAO,CAAC,gBAAgB,CAAmB;IAG3C,OAAO,CAAC,iBAAiB,CAAoB;IAG7C,OAAO,CAAC,YAAY,CAA8B;IAE5C,MAAM,CACV,UAAU,EAAE,KAAK,CACf,MAAM,CAAC,SAAS,CAAC,8BAA8B,GAAG,MAAM,CAAC,SAAS,CAAC,mCAAmC,CACvG,EACD,QAAQ,EAAE,UAAU,EACpB,IAAI,EAAE,cAAc,EACpB,WAAW,UAAQ,GAClB,OAAO,CACR,MAAM,CAAC,SAAS,CAAC,8BAA8B,GAAG,MAAM,CAAC,SAAS,CAAC,mCAAmC,GAAG,SAAS,CACnH;CAmDF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatterSelect.js","sourceRoot":"","sources":["../../../src/browser/format/formatterSelect.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAiH;
|
|
1
|
+
{"version":3,"file":"formatterSelect.js","sourceRoot":"","sources":["../../../src/browser/format/formatterSelect.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,iEAAiH;AAGjH,qGAA0G;AAE1G,8CAAiE;AAK1D,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAU7B,KAAK,CAAC,MAAM,CACV,UAEC,EACD,QAAoB,EACpB,IAAoB,EACpB,WAAW,GAAG,KAAK;QAInB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,sBAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACpF,IAAI,CAAC,MAAM,EAAE;YACX,OAAO;SACR;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC;QAC9C,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,IAAI,SAAS,CAAC;QACd,IAAI,CAAC,WAAW,EAAE;YAChB,SAAS,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAA4B,2BAA2B,CAAC,IAAI,EAAE,CAAC,CACpG,UAAU,CACX,CAAC;SACH;QAED,MAAM,QAAQ,GAAiC,EAAE,CAAC;QAClD,UAAU,CAAC,OAAO,CAAC,CAAC,QAAmB,EAAE,EAAE;YACzC,IAAI,QAAQ,CAAC,WAAW,EAAE;gBACxB,QAAQ,CAAC,QAAQ,CAAC,WAAkB,CAAC,GAAG,QAAQ,CAAC;aAClD;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,SAAS,IAAI,CAAC,WAAW,EAAE;YAC7B,MAAM,GAAG,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,QAAmB,EAAE,EAAE,CAAC,QAAQ,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC;YAC9F,IAAI,GAAG,IAAI,CAAC,EAAE;gBACZ,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC;aACxB;SACF;aAAM,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE;YAChD,OAAO,UAAU,CAAC,CAAC,CAAC,CAAC;SACtB;QAED,IAAI,IAAI,KAAK,uBAAc,CAAC,QAAQ,EAAE;YACpC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAC/C,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAChC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAY;gBAC/B,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,WAAW;aAC/B,CAAC,CAAC,EACH,EAAE,WAAW,EAAE,IAAA,2BAAQ,EAAC,+BAA+B,CAAC,EAAE,CAC3D,CAAC;YACF,IAAI,QAAQ,EAAE;gBACZ,MAAM,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAA4B,2BAA2B,CAAC,IAAI,EAAE,CAAC;gBACxG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CACxB,2BAA2B,kCACtB,MAAM,KAAE,CAAC,UAAU,CAAC,EAAE,QAAQ,KACnC,kCAAe,CAAC,IAAI,CACrB,CAAC;gBACF,OAAO,QAAQ,CAAC,QAAe,CAAC,CAAC;aAClC;SACF;aAAM;YACL,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;CACF,CAAA;AArEC;IAAC,IAAA,cAAS,EAAC,mCAAgB,CAAC;;4DACe;AAE3C;IAAC,IAAA,cAAS,EAAC,oCAAiB,CAAC;;6DACgB;AAE7C;IAAC,IAAA,cAAS,EAAC,mCAA2B,CAAC;;wDACW;AARvC,kBAAkB;IAD9B,IAAA,eAAU,GAAE;GACA,kBAAkB,CAsE9B;AAtEY,gDAAkB"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
2
|
-
import IMonacoModel = monaco.editor.IModel;
|
|
3
|
-
import IMonacoMarkerData = monaco.editor.IMarkerData;
|
|
4
1
|
import { DisposableCollection, IDisposable } from '@opensumi/ide-core-common';
|
|
2
|
+
import * as monaco from '@opensumi/ide-monaco';
|
|
5
3
|
import { Diagnostic, DiagnosticCollection } from '../../common';
|
|
4
|
+
type IMonacoModel = monaco.editor.ITextModel;
|
|
5
|
+
type IMonacoMarkerData = monaco.editor.IMarkerData;
|
|
6
6
|
export declare class MonacoDiagnosticCollection implements DiagnosticCollection {
|
|
7
7
|
protected readonly name: string;
|
|
8
8
|
protected readonly diagnostics: Map<string, MonacoModelDiagnostics | undefined>;
|
|
@@ -25,4 +25,5 @@ export declare class MonacoModelDiagnostics implements IDisposable {
|
|
|
25
25
|
updateModelMarkers(): void;
|
|
26
26
|
protected doUpdateModelMarkers(model: IMonacoModel | null): void;
|
|
27
27
|
}
|
|
28
|
+
export {};
|
|
28
29
|
//# sourceMappingURL=diagnostic-collection.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-collection.d.ts","sourceRoot":"","sources":["../../../src/browser/language/diagnostic-collection.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"diagnostic-collection.d.ts","sourceRoot":"","sources":["../../../src/browser/language/diagnostic-collection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,oBAAoB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAG/C,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAuB,MAAM,cAAc,CAAC;AAErF,KAAK,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;AAC7C,KAAK,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;AAEnD,qBAAa,0BAA2B,YAAW,oBAAoB;IAIzD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM;IAH3C,SAAS,CAAC,QAAQ,CAAC,WAAW,kDAAyD;IACvF,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAA8B;gBAE3B,IAAI,EAAE,MAAM;IAE3C,OAAO;IAIP,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,UAAU,EAAE;IAK9B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI;CAelD;AAED,qBAAa,sBAAuB,YAAW,WAAW;IAIJ,QAAQ,CAAC,KAAK,EAAE,MAAM;IAH1E,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC;IACzB,SAAS,CAAC,QAAQ,EAAE,iBAAiB,EAAE,CAAM;IAC7C,SAAS,CAAC,YAAY,EAAE,UAAU,EAAE,CAAM;gBAC9B,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,EAAW,KAAK,EAAE,MAAM;IAM1E,IAAI,WAAW,CAAC,WAAW,EAAE,UAAU,EAAE,EAIxC;IAED,IAAI,WAAW,IAAI,UAAU,EAAE,CAE9B;IAED,IAAI,OAAO,IAAI,aAAa,CAAC,iBAAiB,CAAC,CAE9C;IAED,OAAO,IAAI,IAAI;IAKf,kBAAkB,IAAI,IAAI;IAK1B,SAAS,CAAC,oBAAoB,CAAC,KAAK,EAAE,YAAY,GAAG,IAAI,GAAG,IAAI;CAKjE"}
|
|
@@ -2,10 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MonacoModelDiagnostics = exports.MonacoDiagnosticCollection = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
-
const monaco = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/editor.api"));
|
|
6
|
-
// eslint-disable-next-line import/order
|
|
7
5
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
8
|
-
|
|
6
|
+
const monaco = tslib_1.__importStar(require("@opensumi/ide-monaco"));
|
|
7
|
+
const monaco_api_1 = require("@opensumi/ide-monaco/lib/browser/monaco-api");
|
|
9
8
|
const common_1 = require("../../common");
|
|
10
9
|
class MonacoDiagnosticCollection {
|
|
11
10
|
constructor(name) {
|
|
@@ -43,7 +42,7 @@ class MonacoModelDiagnostics {
|
|
|
43
42
|
this._diagnostics = [];
|
|
44
43
|
this.uri = monaco.Uri.parse(uri);
|
|
45
44
|
this.diagnostics = diagnostics;
|
|
46
|
-
|
|
45
|
+
monaco_api_1.monacoApi.editor.onDidCreateModel((model) => this.doUpdateModelMarkers(model));
|
|
47
46
|
}
|
|
48
47
|
set diagnostics(diagnostics) {
|
|
49
48
|
this._diagnostics = diagnostics;
|
|
@@ -61,12 +60,12 @@ class MonacoModelDiagnostics {
|
|
|
61
60
|
this.updateModelMarkers();
|
|
62
61
|
}
|
|
63
62
|
updateModelMarkers() {
|
|
64
|
-
const model =
|
|
63
|
+
const model = monaco_api_1.monacoApi.editor.getModel(this.uri);
|
|
65
64
|
this.doUpdateModelMarkers(model);
|
|
66
65
|
}
|
|
67
66
|
doUpdateModelMarkers(model) {
|
|
68
67
|
if (model && this.uri.toString() === model.uri.toString()) {
|
|
69
|
-
|
|
68
|
+
monaco_api_1.monacoApi.editor.setModelMarkers(model, this.owner, this._markers);
|
|
70
69
|
}
|
|
71
70
|
}
|
|
72
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"diagnostic-collection.js","sourceRoot":"","sources":["../../../src/browser/language/diagnostic-collection.ts"],"names":[],"mappings":";;;;AAAA
|
|
1
|
+
{"version":3,"file":"diagnostic-collection.js","sourceRoot":"","sources":["../../../src/browser/language/diagnostic-collection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IDisposable, IMarkerData, URI } from '@opensumi/ide-core-common';
|
|
2
|
-
import * as monaco from '@opensumi/monaco
|
|
2
|
+
import * as monaco from '@opensumi/ide-monaco';
|
|
3
3
|
import { Diagnostic, ILanguageService, Language, WorkspaceSymbolProvider } from '../../common';
|
|
4
4
|
import { MonacoDiagnosticCollection } from './diagnostic-collection';
|
|
5
5
|
export type Mutable<T> = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language.service.d.ts","sourceRoot":"","sources":["../../../src/browser/language/language.service.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,WAAW,EACX,WAAW,EAIX,GAAG,EACJ,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"language.service.d.ts","sourceRoot":"","sources":["../../../src/browser/language/language.service.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,WAAW,EACX,WAAW,EAIX,GAAG,EACJ,MAAM,2BAA2B,CAAC;AACnC,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAG/C,OAAO,EACL,UAAU,EAGV,gBAAgB,EAChB,QAAQ,EACR,uBAAuB,EACxB,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,0BAA0B,EAAE,MAAM,yBAAyB,CAAC;AAErE,MAAM,MAAM,OAAO,CAAC,CAAC,IAAI;IAAE,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAuC5D,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,UAAU,CAsB5D;AAED,qBACa,eAAgB,YAAW,gBAAgB;IAEtD,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,eAAe,CAA4B;IAEnD,SAAS,CAAC,QAAQ,CAAC,OAAO,0CAAiD;IAE3E,QAAQ,CAAC,wBAAwB,EAAE,uBAAuB,EAAE,CAAM;;IAalE,IAAI,SAAS,IAAI,QAAQ,EAAE,CAE1B;IAED,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS;IAMrD,SAAS,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,uBAAuB,EAAE,GAAG,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAgChH,+BAA+B,CAAC,QAAQ,EAAE,uBAAuB,GAAG,WAAW;IAU/E,SAAS,CAAC,aAAa,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI;CAsBxC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"language.service.js","sourceRoot":"","sources":["../../../src/browser/language/language.service.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,+DAQmC;
|
|
1
|
+
{"version":3,"file":"language.service.js","sourceRoot":"","sources":["../../../src/browser/language/language.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.context.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/editor.context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,gBAAgB,EAAU,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"editor.context.d.ts","sourceRoot":"","sources":["../../../src/browser/menu/editor.context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,0BAA0B,EAAE,gBAAgB,EAAU,MAAM,0CAA0C,CAAC;AAEhH,OAAO,EAAE,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAEpE,OAAO,EAAE,OAAO,EAAE,MAAM,6EAA6E,CAAC;AAItG,OAAO,EAAE,mBAAmB,EAAE,MAAM,gEAAgE,CAAC;AACrG,OAAO,EAAE,qBAAqB,EAAE,MAAM,oFAAoF,CAAC;AAE3H,qBAAa,2BAA4B,SAAQ,UAAW,YAAW,mBAAmB;IAUtF,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,uBAAuB;IACxC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,UAAU;IAZpB,gBAAuB,EAAE,gCAAgC;WAE3C,GAAG,CAAC,MAAM,EAAE,WAAW,GAAG,qBAAqB,GAAG,IAAI;IAIpE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAqB;gBAGpC,kBAAkB,EAAE,0BAA0B,EAC9C,uBAAuB,EAAE,kBAAkB,EAC3C,mBAAmB,EAAE,gBAAgB,EAC9C,UAAU,EAAE,WAAW;IAkBjC,eAAe,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI;IAsB9C,OAAO,CAAC,aAAa;IA4DrB,OAAO,CAAC,kBAAkB;IAmD1B,OAAO,CAAC,YAAY;CASrB"}
|
|
@@ -4,12 +4,12 @@ exports.EditorContextMenuController = void 0;
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
6
6
|
const next_1 = require("@opensumi/ide-core-browser/lib/menu/next");
|
|
7
|
+
const monaco = tslib_1.__importStar(require("@opensumi/ide-monaco"));
|
|
7
8
|
const dom = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/base/browser/dom"));
|
|
8
9
|
const keyCodes_1 = require("@opensumi/monaco-editor-core/esm/vs/base/common/keyCodes");
|
|
9
10
|
const editorBrowser_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser");
|
|
10
11
|
const editorOptions_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/config/editorOptions");
|
|
11
12
|
const contextmenu_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/contrib/contextmenu/browser/contextmenu");
|
|
12
|
-
const monaco = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/editor.api"));
|
|
13
13
|
class EditorContextMenuController extends ide_core_browser_1.Disposable {
|
|
14
14
|
static get(editor) {
|
|
15
15
|
return editor.getContribution(contextmenu_1.ContextMenuController.ID);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor.context.js","sourceRoot":"","sources":["../../../src/browser/menu/editor.context.ts"],"names":[],"mappings":";;;;AAAA,iEAA4E;AAC5E,mEAAgH;
|
|
1
|
+
{"version":3,"file":"editor.context.js","sourceRoot":"","sources":["../../../src/browser/menu/editor.context.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"MergeEditorFloatComponents.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"AAGA,OAAO,EAML,GAAG,EAIJ,MAAM,4BAA4B,CAAC;AAGpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,eAAO,MAAM,0BAA0B,EAAE,oBAAoB,CAAC;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,CAmHzE,CAAC"}
|
|
@@ -7,8 +7,26 @@ const ide_components_1 = require("@opensumi/ide-components");
|
|
|
7
7
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
8
|
const editor_module_less_1 = tslib_1.__importDefault(require("../editor.module.less"));
|
|
9
9
|
const MergeEditorFloatComponents = ({ resource }) => {
|
|
10
|
+
const aiNativeConfigService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AINativeConfigService);
|
|
10
11
|
const commandService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandService);
|
|
11
12
|
const commandRegistry = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.CommandRegistry);
|
|
13
|
+
const contextKeyService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.IContextKeyService);
|
|
14
|
+
const [isVisiable, setIsVisiable] = (0, react_1.useState)(false);
|
|
15
|
+
const gitMergeChangesSet = new Set(['git.mergeChanges']);
|
|
16
|
+
(0, react_1.useEffect)(() => {
|
|
17
|
+
const run = () => {
|
|
18
|
+
const mergeChanges = contextKeyService.getValue('git.mergeChanges') || [];
|
|
19
|
+
setIsVisiable(mergeChanges.some((value) => value.toString() === resource.uri.toString()));
|
|
20
|
+
};
|
|
21
|
+
const disposed = contextKeyService.onDidChangeContext(({ payload }) => {
|
|
22
|
+
if (payload.affectsSome(gitMergeChangesSet)) {
|
|
23
|
+
run();
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
run();
|
|
27
|
+
return () => disposed.dispose();
|
|
28
|
+
}, [resource]);
|
|
29
|
+
const [isAiResolving, setIsAiResolving] = (0, react_1.useState)(false);
|
|
12
30
|
const handleOpenMergeEditor = (0, react_1.useCallback)(async () => {
|
|
13
31
|
const { uri } = resource;
|
|
14
32
|
[ide_core_browser_1.SCM_COMMANDS.GIT_OPEN_MERGE_EDITOR, ide_core_browser_1.SCM_COMMANDS._GIT_OPEN_MERGE_EDITOR].forEach(({ id: command }) => {
|
|
@@ -17,8 +35,49 @@ const MergeEditorFloatComponents = ({ resource }) => {
|
|
|
17
35
|
}
|
|
18
36
|
});
|
|
19
37
|
}, [resource]);
|
|
38
|
+
const isSupportAiResolve = (0, react_1.useCallback)(() => aiNativeConfigService.capabilities.supportsConflictResolve, [aiNativeConfigService]);
|
|
39
|
+
const handlePrev = () => {
|
|
40
|
+
commandService.tryExecuteCommand('merge-conflict.previous');
|
|
41
|
+
};
|
|
42
|
+
const handleNext = () => {
|
|
43
|
+
commandService.tryExecuteCommand('merge-conflict.next');
|
|
44
|
+
};
|
|
45
|
+
const handleAIResolve = (0, react_1.useCallback)(async () => {
|
|
46
|
+
setIsAiResolving(true);
|
|
47
|
+
if (isAiResolving) {
|
|
48
|
+
await commandService.executeCommand('merge-conflict.ai.all-accept-stop', resource.uri);
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
await commandService.executeCommand('merge-conflict.ai.all-accept', resource.uri);
|
|
52
|
+
}
|
|
53
|
+
setIsAiResolving(false);
|
|
54
|
+
}, [resource, isAiResolving]);
|
|
55
|
+
const handleReset = (0, react_1.useCallback)(() => {
|
|
56
|
+
commandService.executeCommand('merge-conflict.ai.all-reset', resource.uri);
|
|
57
|
+
}, [resource]);
|
|
58
|
+
if (!isVisiable) {
|
|
59
|
+
return null;
|
|
60
|
+
}
|
|
20
61
|
return (react_1.default.createElement("div", { className: editor_module_less_1.default.merge_editor_float_container },
|
|
21
|
-
react_1.default.createElement(
|
|
62
|
+
react_1.default.createElement("div", { id: 'merge.editor.action.button.accept' },
|
|
63
|
+
react_1.default.createElement(ide_components_1.Button, { className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handlePrev },
|
|
64
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'left' }),
|
|
65
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.prev'))),
|
|
66
|
+
react_1.default.createElement(ide_components_1.Button, { className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handleNext },
|
|
67
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.next')),
|
|
68
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'right' }))),
|
|
69
|
+
react_1.default.createElement("span", { className: editor_module_less_1.default.line_vertical }),
|
|
70
|
+
react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.open.tradition', className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handleOpenMergeEditor },
|
|
71
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'swap' }),
|
|
72
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.open.3way'))),
|
|
73
|
+
react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.rest', className: editor_module_less_1.default.merge_conflict_bottom_btn, size: 'large', onClick: handleReset },
|
|
74
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'discard' }),
|
|
75
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.reset'))),
|
|
76
|
+
isSupportAiResolve() && (react_1.default.createElement(ide_components_1.Button, { id: 'merge.editor.conflict.resolve.all', size: 'large', className: `${editor_module_less_1.default.merge_conflict_bottom_btn} ${editor_module_less_1.default.magic_btn}`, onClick: handleAIResolve }, isAiResolving ? (react_1.default.createElement(react_1.default.Fragment, null,
|
|
77
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'circle-pause' }),
|
|
78
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.resolve.all.stop')))) : (react_1.default.createElement(react_1.default.Fragment, null,
|
|
79
|
+
react_1.default.createElement(ide_components_1.Icon, { icon: 'magic-wand' }),
|
|
80
|
+
react_1.default.createElement("span", null, (0, ide_core_browser_1.localize)('mergeEditor.conflict.resolve.all'))))))));
|
|
22
81
|
};
|
|
23
82
|
exports.MergeEditorFloatComponents = MergeEditorFloatComponents;
|
|
24
83
|
//# sourceMappingURL=MergeEditorFloatComponents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"MergeEditorFloatComponents.js","sourceRoot":"","sources":["../../../src/browser/merge-editor/MergeEditorFloatComponents.tsx"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import { ResourceService } from '../../common';
|
|
|
3
3
|
import { BrowserEditorContribution, EditorComponentRegistry } from '../types';
|
|
4
4
|
export declare class MergeEditorContribution extends Disposable implements BrowserEditorContribution {
|
|
5
5
|
private readonly mergeEditorResourceProvider;
|
|
6
|
-
private readonly contextKeyService;
|
|
7
6
|
registerResource(resourceService: ResourceService): void;
|
|
8
7
|
registerEditorComponent(registry: EditorComponentRegistry): void;
|
|
9
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"merge-editor.contribution.d.ts","sourceRoot":"","sources":["../../../src/browser/merge-editor/merge-editor.contribution.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAmB,MAAM,4BAA4B,CAAC;AAEzE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAkB,MAAM,UAAU,CAAC;AAO9F,qBACa,uBAAwB,SAAQ,UAAW,YAAW,yBAAyB;IAE1F,OAAO,CAAC,QAAQ,CAAC,2BAA2B,CAA8B;IAE1E,gBAAgB,CAAC,eAAe,EAAE,eAAe,GAAG,IAAI;IAIxD,uBAAuB,CAAC,QAAQ,EAAE,uBAAuB;CAoB1D"}
|
|
@@ -26,8 +26,8 @@ let MergeEditorContribution = class MergeEditorContribution extends ide_core_bro
|
|
|
26
26
|
if (uri.scheme !== ide_core_browser_1.Schemes.file) {
|
|
27
27
|
return false;
|
|
28
28
|
}
|
|
29
|
-
|
|
30
|
-
return
|
|
29
|
+
// 由于存在时序问题，具体是否显示的逻辑由组件内部处理
|
|
30
|
+
return true;
|
|
31
31
|
},
|
|
32
32
|
});
|
|
33
33
|
}
|
|
@@ -36,10 +36,6 @@ tslib_1.__decorate([
|
|
|
36
36
|
(0, di_1.Autowired)(),
|
|
37
37
|
tslib_1.__metadata("design:type", merge_editor_provider_1.MergeEditorResourceProvider)
|
|
38
38
|
], MergeEditorContribution.prototype, "mergeEditorResourceProvider", void 0);
|
|
39
|
-
tslib_1.__decorate([
|
|
40
|
-
(0, di_1.Autowired)(ide_core_browser_1.IContextKeyService),
|
|
41
|
-
tslib_1.__metadata("design:type", Object)
|
|
42
|
-
], MergeEditorContribution.prototype, "contextKeyService", void 0);
|
|
43
39
|
MergeEditorContribution = tslib_1.__decorate([
|
|
44
40
|
(0, ide_core_browser_1.Domain)(types_1.BrowserEditorContribution)
|
|
45
41
|
], MergeEditorContribution);
|
|
@@ -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,
|
|
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"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { CancellationToken, IPosition, RefCountedDisposable, Uri } from '@opensumi/ide-core-common';
|
|
2
2
|
import { CallHierarchyItem, CallHierarchyProvider, ICallHierarchyService, IncomingCall, OutgoingCall } from '@opensumi/ide-monaco/lib/browser/contrib/callHierarchy';
|
|
3
|
-
import { ITextModel, Position } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
3
|
+
import { ITextModel, Position, ProviderResult } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
4
4
|
import { IEditorDocumentModelService } from '../../doc-model/types';
|
|
5
|
-
declare type ProviderResult<T> = T | undefined | null | Thenable<T | undefined | null>;
|
|
6
5
|
export declare class CallHierarchyModel {
|
|
7
6
|
readonly id: string;
|
|
8
7
|
readonly provider: CallHierarchyProvider;
|
|
@@ -24,5 +23,4 @@ export declare class CallHierarchyService implements ICallHierarchyService {
|
|
|
24
23
|
provideIncomingCalls(item: CallHierarchyItem): ProviderResult<IncomingCall[]>;
|
|
25
24
|
provideOutgoingCalls(item: CallHierarchyItem): ProviderResult<OutgoingCall[]>;
|
|
26
25
|
}
|
|
27
|
-
export {};
|
|
28
26
|
//# sourceMappingURL=callHierarchy.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"callHierarchy.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EACT,oBAAoB,EAEpB,GAAG,EAGJ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EAErB,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACb,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"callHierarchy.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,iBAAiB,EAEjB,SAAS,EACT,oBAAoB,EAEpB,GAAG,EAGJ,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,iBAAiB,EACjB,qBAAqB,EAErB,qBAAqB,EACrB,YAAY,EACZ,YAAY,EACb,MAAM,wDAAwD,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,mDAAmD,CAAC;AAEzG,OAAO,EAAE,2BAA2B,EAAE,MAAM,uBAAuB,CAAC;AAUpE,qBAAa,kBAAkB;IAyB3B,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,QAAQ,CAAC,QAAQ,EAAE,qBAAqB;IACxC,QAAQ,CAAC,KAAK,EAAE,iBAAiB,EAAE;IACnC,QAAQ,CAAC,GAAG,EAAE,oBAAoB;WA3BvB,MAAM,CACjB,KAAK,EAAE,UAAU,EACjB,QAAQ,EAAE,SAAS,EACnB,KAAK,EAAE,iBAAiB,GACvB,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC;IAiB1C,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;IAEjC,OAAO;IASP,OAAO,IAAI,IAAI;IAIf,IAAI,CAAC,IAAI,EAAE,iBAAiB,GAAG,kBAAkB;IAS3C,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;IAYhG,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,iBAAiB,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;CAWvG;AAED,qBACa,oBAAqB,YAAW,qBAAqB;IAEhE,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,2BAA2B,CAAC;IAE7D,OAAO,CAAC,MAAM,CAA0E;IAExF,6BAA6B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,qBAAqB;IAItE,4BAA4B,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ;IA4BpE,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;IAS7E,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC,YAAY,EAAE,CAAC;CAQ9E"}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"callHierarchy.service.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/callHierarchy/callHierarchy.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -85,7 +85,7 @@ export declare class MonacoCommandRegistry implements IMonacoCommandsRegistry {
|
|
|
85
85
|
* 获取当前活动的编辑器
|
|
86
86
|
* 此处的活动编辑器和 workbenchEditorService.currentEditor 的概念不同，对于diffEditor，需要获取确实的那个editor而不是modifiedEditor
|
|
87
87
|
*/
|
|
88
|
-
|
|
88
|
+
getActiveCodeEditor(): ICodeEditor | undefined;
|
|
89
89
|
}
|
|
90
90
|
export declare class MonacoActionRegistry implements IMonacoActionRegistry {
|
|
91
91
|
private static COMMON_ACTIONS;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/command/command.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,cAAc,EACd,eAAe,EACf,cAAc,EAEd,OAAO,EAGP,gBAAgB,EAMjB,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EACL,wBAAwB,EACxB,aAAa,EACb,eAAe,EACf,qBAAqB,EACrB,qBAAqB,EACrB,uBAAuB,EAEvB,0BAA0B,EAC3B,MAAM,kDAAkD,CAAC;AAG1D,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,mDAAmD,CAAC;AAE/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAe1D;;;;GAIG;AACH,oBAAY,iBAAiB;IAC3B,MAAM,IAAA;IACN,OAAO,IAAA;CACR;AAED,MAAM,MAAM,aAAa,GAAG,OAAO,GAAG;IAAE,IAAI,EAAE,iBAAiB,CAAA;CAAE,CAAC;AAElE,qBACa,oBAAqB,YAAW,qBAAqB;IAChE,aAAa,EAAE,SAAS,CAAC;IAEzB,OAAO,CAAC,oBAAoB,CAAwD;IAEpF,mBAAmB,EAAE,KAAK,CAAC,aAAa,CAAC,CAAmC;IAE5E,OAAO,CAAC,QAAQ,CAAkB;IAClC;;;;OAIG;IACH,qBAAqB,EAAE,OAAO,CAAC,aAAa,CAAC,CAAgC;IAG7E,OAAO,CAAC,MAAM,CAAU;IAGxB,eAAe,EAAE,eAAe,CAAC;IAGjC,cAAc,EAAE,cAAc,CAAC;IAG/B,eAAe,EAAE,gBAAgB,CAAC;IAElC;;;OAGG;IACH,WAAW,CAAC,QAAQ,EAAE,eAAe;IAIrC,IAAI,oBAAoB,IAAI,MAAM,CAAC,aAAa,CAAC,CAEhD;IAED;;;;;OAKG;IACG,cAAc,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;CAwBnF;AAED,qBACa,qBAAsB,YAAW,uBAAuB;IAEnE,OAAO,CAAC,QAAQ,CAAkB;IAGlC,OAAO,CAAC,sBAAsB,CAAyB;IAGvD,OAAO,CAAC,uBAAuB,CAA0B;IAGzD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAgC;IAExE;;;;OAIG;IACH,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI7C;;;;;;OAMG;IACH,eAAe,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAI5E;;;;;OAKG;IACH,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,0BAA0B,GAAG,IAAI;IAI7E;;;OAGG;IACH,SAAS,CAAC,UAAU,CAAC,aAAa,EAAE,0BAA0B,GAAG,cAAc;IAM/E;;;;OAIG;IACH,SAAS,CAAC,OAAO,CAAC,aAAa,EAAE,0BAA0B,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,GAAG;IASjF,IAAI,iBAAiB,IAAI,iBAAiB,GAAG,SAAS,CAErD;IAED;;;OAGG;
|
|
1
|
+
{"version":3,"file":"command.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/command/command.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -220,7 +220,7 @@ let MonacoActionRegistry = MonacoActionRegistry_1 = class MonacoActionRegistry {
|
|
|
220
220
|
}
|
|
221
221
|
registerMonacoActions() {
|
|
222
222
|
var _a;
|
|
223
|
-
const editorActions = new Map(this.monacoEditorRegistry.getEditorActions().map(({ id, label, alias }) => [
|
|
223
|
+
const editorActions = new Map(Array.from(this.monacoEditorRegistry.getEditorActions()).map(({ id, label, alias }) => [
|
|
224
224
|
id,
|
|
225
225
|
{
|
|
226
226
|
label,
|
|
@@ -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,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B;AAKM,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAA1B;QAGG,yBAAoB,GAA2B,IAAI,0BAAO,EAAiB,CAAC;QAEpF,wBAAmB,GAAyB,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC;QAG5E;;;;WAIG;QACH,0BAAqB,GAA2B,IAAI,0BAAO,EAAiB,CAAC;IAwD/E,CAAC;IA1CC;;;OAGG;IACH,WAAW,CAAC,QAAyB;QACnC,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAED,IAAI,oBAAoB;QACtB,OAAO,IAAI,CAAC,qBAAqB,CAAC,KAAK,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,cAAc,CAAI,SAAiB,EAAE,GAAG,IAAW;QACvD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;QAC3C,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,cAAc,CAAI,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC;YAC5E,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,OAAO,GAAG,CAAC;SACZ;QAAC,OAAO,GAAG,EAAE;YACZ,6CAA6C;YAC7C,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,MAAK,GAAG,oCAAiB,IAAI,SAAS,EAAE,EAAE;gBACrD,MAAM,GAAG,CAAC;aACX;SACF;QACD,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,cAAc,CACtC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,EACzE,GAAG,IAAI,CACR,CAAC;YACF,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,OAAO,GAAG,CAAC;SACZ;QACD,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,8BAAW,CAAC,iBAAiB,EAAE,SAAS,CAAC,CAAC;QACrE,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,YAAY,SAAS,aAAa,CAAC,CAAC,CAAC;IACvE,CAAC;CACF,CAAA;AAtDC;IAAC,IAAA,cAAS,EAAC,0BAAO,CAAC;;oDACK;AAExB;IAAC,IAAA,cAAS,EAAC,kCAAe,CAAC;;6DACM;AAEjC;IAAC,IAAA,cAAS,EAAC,iCAAc,CAAC;;4DACK;AAE/B;IAAC,IAAA,cAAS,EAAC,mCAAgB,CAAC;;6DACM;AAzBvB,oBAAoB;IADhC,IAAA,eAAU,GAAE;GACA,oBAAoB,CAqEhC;AArEY,oDAAoB;AAwE1B,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAahC;;;;OAIG;IACH,QAAQ,CAAC,OAAe;;QACtB,OAAO,MAAA,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,0CAAE,EAAE,CAAC;IAClD,CAAC;IAED;;;;;;OAMG;IACH,eAAe,CAAC,OAAgB,EAAE,OAAmC;QACnE,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACnE,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,SAAiB,EAAE,OAAmC;QACpE,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC;IACrE,CAAC;IAED;;;OAGG;IACO,UAAU,CAAC,aAAyC;QAC5D,OAAO;YACL,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,GAAG,IAAI,CAAC;SAC3D,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACO,OAAO,CAAC,aAAyC,EAAE,GAAG,IAAW;QACzE,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC1C,IAAI,MAAM,EAAE;YACV,kBAAkB;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;SAChE;QACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,iBAAiB;QACnB,OAAO,IAAI,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,+BAAY,CAAC,mBAAmB,CAAC,CAAC;IAC7F,CAAC;IAED;;;OAGG;
|
|
1
|
+
{"version":3,"file":"command.service.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/command/command.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { IGrammar, StackElement } from 'vscode-textmate';
|
|
2
2
|
import { Disposable, Event } from '@opensumi/ide-core-common/lib/utils';
|
|
3
|
-
import * as monaco from '@opensumi/monaco
|
|
3
|
+
import * as monaco from '@opensumi/ide-monaco';
|
|
4
4
|
export declare class TokenizerState implements monaco.languages.IState {
|
|
5
5
|
readonly ruleStack: StackElement;
|
|
6
6
|
constructor(ruleStack: StackElement);
|
|
@@ -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;
|
|
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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"textmate-tokenizer.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/tokenizer/textmate-tokenizer.ts"],"names":[],"mappings":";;;AAAA,qDAAkE;AAElE,+DAAiF;
|
|
1
|
+
{"version":3,"file":"textmate-tokenizer.js","sourceRoot":"","sources":["../../../../src/browser/monaco-contrib/tokenizer/textmate-tokenizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../../src/browser/preference/converter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iFAAiF,CAAC;AAExH,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,oBAAoB,EAAE,qBAAqB,EAC3C,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,EAAE,GACrB,uBAAuB,
|
|
1
|
+
{"version":3,"file":"converter.d.ts","sourceRoot":"","sources":["../../../src/browser/preference/converter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,iFAAiF,CAAC;AAExH,OAAO,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAInD;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,oBAAoB,EAAE,qBAAqB,EAC3C,WAAW,CAAC,EAAE,MAAM,EACpB,QAAQ,CAAC,EAAE,MAAM,EACjB,WAAW,CAAC,EAAE,MAAM,EAAE,GACrB,uBAAuB,CAiFzB;AAED,KAAK,WAAW,GAAG,KAAK,CAAC;AACzB,KAAK,oBAAoB,GAAG,MAAM,CAAC;AACnC,KAAK,mBAAmB,GAAG,MAAM,CAAC;AAClC;;GAEG;AACH,UAAU,uBAAuB;IAC/B;;OAEG;IACH,MAAM,EAAE,mBAAmB,CAAC;IAC5B;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,KAAK,GAAG,CAAC;CAC/B;AACD;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,GAAG,CAAC,oBAAoB,EAAE,WAAW,GAAG,uBAAuB,CAmoBnG,CAAC;AAEH,eAAO,MAAM,gCAAgC,EAAE,GAAG,CAAC,oBAAoB,EAAE,WAAW,GAAG,uBAAuB,CAM1G,CAAC;AAEL,eAAO,MAAM,2BAA2B,EAAE,GAAG,CAAC,oBAAoB,EAAE,WAAW,GAAG,uBAAuB,CA8EvG,CAAC;AAkBH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,WAMzC;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAEvD"}
|