@opensumi/ide-monaco 3.1.2-next-1718960862.0 → 3.1.2
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/ai-native/BaseInlineContentWidget.d.ts +0 -2
- package/lib/browser/ai-native/BaseInlineContentWidget.d.ts.map +1 -1
- package/lib/browser/ai-native/BaseInlineContentWidget.js +2 -3
- package/lib/browser/ai-native/BaseInlineContentWidget.js.map +1 -1
- package/lib/browser/contrib/merge-editor/components/merge-actions/index.d.ts +1 -2
- package/lib/browser/contrib/merge-editor/components/merge-actions/index.d.ts.map +1 -1
- package/lib/browser/contrib/merge-editor/components/merge-actions/index.js +3 -19
- package/lib/browser/contrib/merge-editor/components/merge-actions/index.js.map +1 -1
- package/lib/browser/contrib/merge-editor/components/merge-actions/merge-actions.module.less +0 -5
- package/lib/browser/contrib/merge-editor/mapping-manager.store.d.ts +0 -1
- package/lib/browser/contrib/merge-editor/mapping-manager.store.d.ts.map +1 -1
- package/lib/browser/contrib/merge-editor/mapping-manager.store.js +0 -3
- package/lib/browser/contrib/merge-editor/mapping-manager.store.js.map +1 -1
- package/lib/browser/contrib/merge-editor/merge-editor.service.d.ts.map +1 -1
- package/lib/browser/contrib/merge-editor/merge-editor.service.js +1 -4
- package/lib/browser/contrib/merge-editor/merge-editor.service.js.map +1 -1
- package/lib/browser/contrib/merge-editor/model/line-range.d.ts +2 -1
- package/lib/browser/contrib/merge-editor/model/line-range.d.ts.map +1 -1
- package/lib/browser/contrib/merge-editor/view/editors/currentCodeEditor.js +1 -1
- package/lib/browser/contrib/merge-editor/view/editors/currentCodeEditor.js.map +1 -1
- package/lib/browser/contrib/merge-editor/view/editors/incomingCodeEditor.js +1 -1
- package/lib/browser/contrib/merge-editor/view/editors/incomingCodeEditor.js.map +1 -1
- package/lib/browser/contrib/merge-editor/view/editors/resultCodeEditor.d.ts +0 -1
- package/lib/browser/contrib/merge-editor/view/editors/resultCodeEditor.d.ts.map +1 -1
- package/lib/browser/contrib/merge-editor/view/editors/resultCodeEditor.js +35 -26
- package/lib/browser/contrib/merge-editor/view/editors/resultCodeEditor.js.map +1 -1
- package/lib/browser/contrib/merge-editor/view/grid.d.ts.map +1 -1
- package/lib/browser/contrib/merge-editor/view/grid.js +9 -8
- package/lib/browser/contrib/merge-editor/view/grid.js.map +1 -1
- package/lib/browser/contrib/merge-editor/view/mini-map.js +2 -2
- package/lib/browser/contrib/merge-editor/view/mini-map.js.map +1 -1
- package/package.json +8 -8
- package/src/browser/ai-native/BaseInlineContentWidget.tsx +2 -3
- package/src/browser/contrib/merge-editor/components/merge-actions/index.tsx +2 -28
- package/src/browser/contrib/merge-editor/components/merge-actions/merge-actions.module.less +0 -5
- package/src/browser/contrib/merge-editor/mapping-manager.store.ts +0 -4
- package/src/browser/contrib/merge-editor/merge-editor.service.ts +1 -6
- package/src/browser/contrib/merge-editor/model/line-range.ts +1 -1
- package/src/browser/contrib/merge-editor/view/editors/currentCodeEditor.ts +1 -1
- package/src/browser/contrib/merge-editor/view/editors/incomingCodeEditor.ts +1 -1
- package/src/browser/contrib/merge-editor/view/editors/resultCodeEditor.ts +38 -23
- package/src/browser/contrib/merge-editor/view/grid.tsx +11 -14
- package/src/browser/contrib/merge-editor/view/mini-map.tsx +2 -2
- package/worker/editor.worker.bundle.js +1 -20771
- package/worker/manifest.json +1 -2
- package/lib/browser/contrib/merge-editor/index.d.ts +0 -2
- package/lib/browser/contrib/merge-editor/index.d.ts.map +0 -1
- package/lib/browser/contrib/merge-editor/index.js +0 -5
- package/lib/browser/contrib/merge-editor/index.js.map +0 -1
- package/lib/browser/contrib/merge-editor/navigate-to.d.ts +0 -11
- package/lib/browser/contrib/merge-editor/navigate-to.d.ts.map +0 -1
- package/lib/browser/contrib/merge-editor/navigate-to.js +0 -60
- package/lib/browser/contrib/merge-editor/navigate-to.js.map +0 -1
- package/src/browser/contrib/merge-editor/index.ts +0 -1
- package/src/browser/contrib/merge-editor/navigate-to.ts +0 -69
- package/worker/editor.worker.bundle.js.map +0 -1
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { Disposable } from '@opensumi/ide-core-common';
|
|
3
3
|
import * as monaco from '../../common';
|
|
4
|
-
import { ContentWidgetPositionPreference } from '../monaco-exports/editor';
|
|
5
4
|
import type { ICodeEditor as IMonacoCodeEditor } from '../monaco-api/types';
|
|
6
5
|
export interface IInlineContentWidget extends monaco.editor.IContentWidget {
|
|
7
6
|
show: (options?: ShowAIContentOptions | undefined) => void;
|
|
@@ -16,7 +15,6 @@ export declare abstract class ReactInlineContentWidget extends Disposable implem
|
|
|
16
15
|
private appConfig;
|
|
17
16
|
allowEditorOverflow: boolean;
|
|
18
17
|
suppressMouseDown: boolean;
|
|
19
|
-
positionPreference: ContentWidgetPositionPreference[];
|
|
20
18
|
protected domNode: HTMLElement;
|
|
21
19
|
protected options: ShowAIContentOptions | undefined;
|
|
22
20
|
private root?;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseInlineContentWidget.d.ts","sourceRoot":"","sources":["../../../src/browser/ai-native/BaseInlineContentWidget.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,UAAU,EAAe,MAAM,2BAA2B,CAAC;AAEpE,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"BaseInlineContentWidget.d.ts","sourceRoot":"","sources":["../../../src/browser/ai-native/BaseInlineContentWidget.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,OAAO,CAAC;AAK1B,OAAO,EAAE,UAAU,EAAe,MAAM,2BAA2B,CAAC;AAEpE,OAAO,KAAK,MAAM,MAAM,cAAc,CAAC;AAGvC,OAAO,KAAK,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE5E,MAAM,WAAW,oBAAqB,SAAQ,MAAM,CAAC,MAAM,CAAC,cAAc;IACxE,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,KAAK,IAAI,CAAC;IAC3D,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,KAAK,IAAI,CAAC;CAC5D;AAED,MAAM,WAAW,oBAAoB;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC;CAC7B;AAED,8BACsB,wBAAyB,SAAQ,UAAW,YAAW,oBAAoB;IAWnF,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,iBAAiB;IATxD,OAAO,CAAC,SAAS,CAAY;IAE7B,mBAAmB,UAAS;IAC5B,iBAAiB,UAAS;IAE1B,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC;IAC/B,SAAS,CAAC,OAAO,EAAE,oBAAoB,GAAG,SAAS,CAAC;IACpD,OAAO,CAAC,IAAI,CAAC,CAAoC;gBAElB,MAAM,EAAE,iBAAiB;aAYxC,UAAU,IAAI,KAAK,CAAC,SAAS;aAC7B,EAAE,IAAI,MAAM;IAEnB,OAAO,IAAI,IAAI;IAKxB,IAAI,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,SAAS,GAAG,IAAI;IAiBtD,IAAI;IAQJ,KAAK,IAAI,MAAM;IAIf,mBAAmB,IAAI,IAAI;IAI3B,UAAU,IAAI,WAAW;IAyBzB,WAAW,IAAI,MAAM,CAAC,MAAM,CAAC,sBAAsB,GAAG,IAAI;IAiB1D;;;OAGG;IACH,SAAS,CAAC,WAAW,IAAI,OAAO;IAUhC,eAAe,IAAI,MAAM;IAIzB,aAAa,IAAI,MAAM;CAGxB"}
|
|
@@ -9,14 +9,13 @@ const di_1 = require("@opensumi/di");
|
|
|
9
9
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
10
10
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
11
11
|
const monaco = tslib_1.__importStar(require("../../common"));
|
|
12
|
-
const
|
|
12
|
+
const monaco_exports_1 = require("../monaco-exports");
|
|
13
13
|
let ReactInlineContentWidget = class ReactInlineContentWidget extends ide_core_common_1.Disposable {
|
|
14
14
|
constructor(editor) {
|
|
15
15
|
super();
|
|
16
16
|
this.editor = editor;
|
|
17
17
|
this.allowEditorOverflow = false;
|
|
18
18
|
this.suppressMouseDown = false;
|
|
19
|
-
this.positionPreference = [editor_1.ContentWidgetPositionPreference.BELOW];
|
|
20
19
|
this.root = null;
|
|
21
20
|
this.addDispose((0, ide_core_common_1.runWhenIdle)(() => {
|
|
22
21
|
this.root = client_1.default.createRoot(this.getDomNode());
|
|
@@ -80,7 +79,7 @@ let ReactInlineContentWidget = class ReactInlineContentWidget extends ide_core_c
|
|
|
80
79
|
if (position) {
|
|
81
80
|
return {
|
|
82
81
|
position,
|
|
83
|
-
preference:
|
|
82
|
+
preference: [monaco_exports_1.editor.ContentWidgetPositionPreference.BELOW],
|
|
84
83
|
};
|
|
85
84
|
}
|
|
86
85
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseInlineContentWidget.js","sourceRoot":"","sources":["../../../src/browser/ai-native/BaseInlineContentWidget.tsx"],"names":[],"mappings":";;;;AAAA,uEAAuC;AACvC,0DAA0B;AAC1B,sEAA8C;AAE9C,qCAAqD;AACrD,iEAAyF;AACzF,+DAAoE;AAEpE,6DAAuC;AACvC,
|
|
1
|
+
{"version":3,"file":"BaseInlineContentWidget.js","sourceRoot":"","sources":["../../../src/browser/ai-native/BaseInlineContentWidget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ export interface IMergeActionsProps {
|
|
|
7
7
|
containerClassName?: string;
|
|
8
8
|
isAIResolving: boolean;
|
|
9
9
|
onAIResolve: () => void;
|
|
10
|
-
canNavigate: boolean;
|
|
11
10
|
handlePrev: () => void;
|
|
12
11
|
handleNext: () => void;
|
|
13
12
|
onReset: () => void;
|
|
@@ -15,5 +14,5 @@ export interface IMergeActionsProps {
|
|
|
15
14
|
beforeAddons?: React.ReactNode;
|
|
16
15
|
afterAddons?: React.ReactNode;
|
|
17
16
|
}
|
|
18
|
-
export declare const MergeActions: ({ uri, summary, editorType, containerClassName, onReset, onSwitchEditor,
|
|
17
|
+
export declare const MergeActions: ({ uri, summary, editorType, containerClassName, onReset, onSwitchEditor, handleNext, handlePrev, beforeAddons, afterAddons, isAIResolving, onAIResolve, }: IMergeActionsProps) => React.JSX.Element;
|
|
19
18
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/browser/contrib/merge-editor/components/merge-actions/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAE3C,OAAO,EAAyB,GAAG,EAA2B,MAAM,4BAA4B,CAAC;AAMjG,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,MAAM,IAAI,CAAC;IAExB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/browser/contrib/merge-editor/components/merge-actions/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAE3C,OAAO,EAAyB,GAAG,EAA2B,MAAM,4BAA4B,CAAC;AAMjG,MAAM,WAAW,kBAAkB;IACjC,GAAG,CAAC,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5B,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAE5B,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,MAAM,IAAI,CAAC;IAExB,UAAU,EAAE,MAAM,IAAI,CAAC;IACvB,UAAU,EAAE,MAAM,IAAI,CAAC;IAEvB,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,cAAc,EAAE,MAAM,IAAI,CAAC;IAE3B,YAAY,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC/B,WAAW,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC/B;AAED,eAAO,MAAM,YAAY,8JAatB,kBAAkB,sBAgGpB,CAAC"}
|
|
@@ -8,32 +8,16 @@ const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
|
8
8
|
const components_1 = require("@opensumi/ide-core-browser/lib/components");
|
|
9
9
|
const use_in_merge_changes_1 = require("@opensumi/ide-core-browser/lib/react-hooks/git/use-in-merge-changes");
|
|
10
10
|
const merge_actions_module_less_1 = tslib_1.__importDefault(require("./merge-actions.module.less"));
|
|
11
|
-
const MergeActions = ({ uri, summary, editorType, containerClassName, onReset, onSwitchEditor,
|
|
11
|
+
const MergeActions = ({ uri, summary, editorType, containerClassName, onReset, onSwitchEditor, handleNext, handlePrev, beforeAddons, afterAddons, isAIResolving, onAIResolve, }) => {
|
|
12
12
|
const inMergeChanges = (0, use_in_merge_changes_1.useInMergeChanges)((uri === null || uri === void 0 ? void 0 : uri.toString()) || '');
|
|
13
13
|
const aiNativeConfigService = (0, ide_core_browser_1.useInjectable)(ide_core_browser_1.AINativeConfigService);
|
|
14
14
|
const isSupportAIResolve = (0, react_1.useCallback)(() => aiNativeConfigService.capabilities.supportsConflictResolve, [aiNativeConfigService]);
|
|
15
|
-
const onClickPrev = (0, react_1.useCallback)(() => {
|
|
16
|
-
if (!canNavigate) {
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
|
-
handlePrev();
|
|
20
|
-
}, [handlePrev, canNavigate]);
|
|
21
|
-
const onClickNext = (0, react_1.useCallback)(() => {
|
|
22
|
-
if (!canNavigate) {
|
|
23
|
-
return;
|
|
24
|
-
}
|
|
25
|
-
handleNext();
|
|
26
|
-
}, [handleNext, canNavigate]);
|
|
27
15
|
return (react_1.default.createElement("div", { className: (0, classnames_1.default)(merge_actions_module_less_1.default.merge_editor_float_container, containerClassName) },
|
|
28
16
|
react_1.default.createElement("div", { className: merge_actions_module_less_1.default.merge_editor_float_container_info },
|
|
29
17
|
react_1.default.createElement("div", { className: merge_actions_module_less_1.default.merge_editor_nav_operator },
|
|
30
|
-
react_1.default.createElement("div", { className: (0,
|
|
31
|
-
[merge_actions_module_less_1.default.disabled]: !canNavigate,
|
|
32
|
-
}), onClick: onClickPrev }, (0, ide_core_browser_1.localize)('mergeEditor.conflict.prev')),
|
|
18
|
+
react_1.default.createElement("div", { className: merge_actions_module_less_1.default.merge_editor_nav_operator_btn, onClick: handlePrev }, (0, ide_core_browser_1.localize)('mergeEditor.conflict.prev')),
|
|
33
19
|
react_1.default.createElement("div", { className: merge_actions_module_less_1.default['vertical-divider'] }),
|
|
34
|
-
react_1.default.createElement("div", { className: (0,
|
|
35
|
-
[merge_actions_module_less_1.default.disabled]: !canNavigate,
|
|
36
|
-
}), onClick: onClickNext }, (0, ide_core_browser_1.localize)('mergeEditor.conflict.next'))),
|
|
20
|
+
react_1.default.createElement("div", { className: merge_actions_module_less_1.default.merge_editor_nav_operator_btn, onClick: handleNext }, (0, ide_core_browser_1.localize)('mergeEditor.conflict.next'))),
|
|
37
21
|
react_1.default.createElement("div", { className: merge_actions_module_less_1.default['vertical-divider'] }),
|
|
38
22
|
react_1.default.createElement("div", null, summary)),
|
|
39
23
|
react_1.default.createElement("div", { className: merge_actions_module_less_1.default['horizontal-divider'] }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/browser/contrib/merge-editor/components/merge-actions/index.tsx"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAC7B,uDAA2C;AAE3C,iEAAiG;AACjG,0EAAyE;AACzE,8GAAwG;AAExG,oGAAiD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/browser/contrib/merge-editor/components/merge-actions/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -27,7 +27,6 @@ export declare class MappingManagerDataStore {
|
|
|
27
27
|
get nonConflictingChangesResolvedCount(): INonConflictingChangesResolvedCount;
|
|
28
28
|
updateNonConflictingChangesResolvedCount(data: Partial<INonConflictingChangesResolvedCount>): void;
|
|
29
29
|
emitChange(): void;
|
|
30
|
-
canNavigate(): boolean;
|
|
31
30
|
summary(): string;
|
|
32
31
|
}
|
|
33
32
|
//# sourceMappingURL=mapping-manager.store.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapping-manager.store.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/merge-editor/mapping-manager.store.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,mCAAmC;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,6BAA6B,EAAE,OAAO,CAAC;CACxC;AAED,qBACa,uBAAuB;IAClC,OAAO,CAAC,oBAAoB,CAAuB;IACnD,YAAY,mDAAmC;IAE/C,SAAS,CAAC,cAAc,SAAK;IAC7B,SAAS,CAAC,2BAA2B,SAAK;IAC1C,SAAS,CAAC,sBAAsB,SAAK;IACrC,SAAS,CAAC,kCAAkC,SAAK;IACjD,SAAS,CAAC,iCAAiC,SAAK;IAChD,SAAS,CAAC,kCAAkC,SAAK;IACjD,SAAS,CAAC,iCAAiC,SAAK;IAChD,SAAS,CAAC,6BAA6B,UAAS;IAEhD,IAAI,cAAc,IAAI,eAAe,CAOpC;IAED,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAYnE,IAAI,kCAAkC,IAAI,mCAAmC,CAQ5E;IAED,wCAAwC,CAAC,IAAI,EAAE,OAAO,CAAC,mCAAmC,CAAC;IAkB3F,UAAU;IAIV,
|
|
1
|
+
{"version":3,"file":"mapping-manager.store.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/merge-editor/mapping-manager.store.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,eAAe;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,mCAAmC;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,6BAA6B,EAAE,OAAO,CAAC;CACxC;AAED,qBACa,uBAAuB;IAClC,OAAO,CAAC,oBAAoB,CAAuB;IACnD,YAAY,mDAAmC;IAE/C,SAAS,CAAC,cAAc,SAAK;IAC7B,SAAS,CAAC,2BAA2B,SAAK;IAC1C,SAAS,CAAC,sBAAsB,SAAK;IACrC,SAAS,CAAC,kCAAkC,SAAK;IACjD,SAAS,CAAC,iCAAiC,SAAK;IAChD,SAAS,CAAC,kCAAkC,SAAK;IACjD,SAAS,CAAC,iCAAiC,SAAK;IAChD,SAAS,CAAC,6BAA6B,UAAS;IAEhD,IAAI,cAAc,IAAI,eAAe,CAOpC;IAED,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAYnE,IAAI,kCAAkC,IAAI,mCAAmC,CAQ5E;IAED,wCAAwC,CAAC,IAAI,EAAE,OAAO,CAAC,mCAAmC,CAAC;IAkB3F,UAAU;IAIV,OAAO;CA8DR"}
|
|
@@ -65,9 +65,6 @@ let MappingManagerDataStore = class MappingManagerDataStore {
|
|
|
65
65
|
emitChange() {
|
|
66
66
|
this._onDataChangeEmitter.fire();
|
|
67
67
|
}
|
|
68
|
-
canNavigate() {
|
|
69
|
-
return this.conflictsCount.lefted > 0;
|
|
70
|
-
}
|
|
71
68
|
summary() {
|
|
72
69
|
const conflictsCount = this.conflictsCount;
|
|
73
70
|
const nonConflictingChangesResolvedCount = this.nonConflictingChangesResolvedCount;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapping-manager.store.js","sourceRoot":"","sources":["../../../../src/browser/contrib/merge-editor/mapping-manager.store.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAC1C,iEAA+E;AAkBxE,IAAM,uBAAuB,GAA7B,MAAM,uBAAuB;IAA7B;QACG,yBAAoB,GAAG,IAAI,0BAAO,EAAQ,CAAC;QACnD,iBAAY,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC;QAErC,mBAAc,GAAG,CAAC,CAAC;QACnB,gCAA2B,GAAG,CAAC,CAAC;QAChC,2BAAsB,GAAG,CAAC,CAAC;QAC3B,uCAAkC,GAAG,CAAC,CAAC;QACvC,sCAAiC,GAAG,CAAC,CAAC;QACtC,uCAAkC,GAAG,CAAC,CAAC;QACvC,sCAAiC,GAAG,CAAC,CAAC;QACtC,kCAA6B,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"mapping-manager.store.js","sourceRoot":"","sources":["../../../../src/browser/contrib/merge-editor/mapping-manager.store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/merge-editor/merge-editor.service.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,UAAU,EAGV,KAAK,
|
|
1
|
+
{"version":3,"file":"merge-editor.service.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/merge-editor/merge-editor.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -191,10 +191,7 @@ let MergeEditorService = class MergeEditorService extends ide_core_browser_1.Dis
|
|
|
191
191
|
await this.fileServiceClient.setContent(stat, resultValue);
|
|
192
192
|
this.fireRestoreState(uri);
|
|
193
193
|
await this.commandService.executeCommand(ide_core_browser_1.EDITOR_COMMANDS.CLOSE.id);
|
|
194
|
-
|
|
195
|
-
if (scmResource) {
|
|
196
|
-
await this.commandService.executeCommand(git_1.GitCommands.Stage, scmResource);
|
|
197
|
-
}
|
|
194
|
+
await this.commandService.executeCommand(`${git_1.GitCommands.Stage}-${uri.toString()}`);
|
|
198
195
|
};
|
|
199
196
|
const { completeCount, shouldCount } = this.resultView.completeSituation();
|
|
200
197
|
if (shouldCount !== completeCount) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge-editor.service.js","sourceRoot":"","sources":["../../../../src/browser/contrib/merge-editor/merge-editor.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"merge-editor.service.js","sourceRoot":"","sources":["../../../../src/browser/contrib/merge-editor/merge-editor.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { IRange } from '@opensumi/monaco-editor-core';
|
|
1
2
|
import { LineRange as MonacoLineRange } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/lineRange';
|
|
2
3
|
import { Range as MonacoRange } from '@opensumi/monaco-editor-core/esm/vs/editor/common/core/range';
|
|
3
4
|
import { ECompleteReason, ETurnDirection, IRangeContrast, LineRangeType } from '../types';
|
|
@@ -77,7 +78,7 @@ export declare class LineRange extends MonacoLineRange implements IRangeContrast
|
|
|
77
78
|
*/
|
|
78
79
|
merge(other: LineRange, isKeep?: boolean): LineRange;
|
|
79
80
|
born(): LineRange;
|
|
80
|
-
toRange(startColumn?: number, endColumn?: number):
|
|
81
|
+
toRange(startColumn?: number, endColumn?: number): IRange;
|
|
81
82
|
toInclusiveRange(startColumn?: number, endColumn?: number): MonacoRange;
|
|
82
83
|
private retainState;
|
|
83
84
|
delta(offset: number): LineRange;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"line-range.d.ts","sourceRoot":"","sources":["../../../../../src/browser/contrib/merge-editor/model/line-range.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"line-range.d.ts","sourceRoot":"","sources":["../../../../../src/browser/contrib/merge-editor/model/line-range.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,7 +112,7 @@ let CurrentCodeEditor = class CurrentCodeEditor extends baseCodeEditor_1.BaseCod
|
|
|
112
112
|
}
|
|
113
113
|
};
|
|
114
114
|
CurrentCodeEditor = tslib_1.__decorate([
|
|
115
|
-
(0, di_1.Injectable)({ multiple:
|
|
115
|
+
(0, di_1.Injectable)({ multiple: false })
|
|
116
116
|
], CurrentCodeEditor);
|
|
117
117
|
exports.CurrentCodeEditor = CurrentCodeEditor;
|
|
118
118
|
//# sourceMappingURL=currentCodeEditor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"currentCodeEditor.js","sourceRoot":"","sources":["../../../../../../src/browser/contrib/merge-editor/view/editors/currentCodeEditor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"currentCodeEditor.js","sourceRoot":"","sources":["../../../../../../src/browser/contrib/merge-editor/view/editors/currentCodeEditor.ts"],"names":[],"mappings":"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"}
|
|
@@ -60,7 +60,7 @@ let IncomingCodeEditor = class IncomingCodeEditor extends baseCodeEditor_1.BaseC
|
|
|
60
60
|
}
|
|
61
61
|
};
|
|
62
62
|
IncomingCodeEditor = tslib_1.__decorate([
|
|
63
|
-
(0, di_1.Injectable)({ multiple:
|
|
63
|
+
(0, di_1.Injectable)({ multiple: false })
|
|
64
64
|
], IncomingCodeEditor);
|
|
65
65
|
exports.IncomingCodeEditor = IncomingCodeEditor;
|
|
66
66
|
//# sourceMappingURL=incomingCodeEditor.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"incomingCodeEditor.js","sourceRoot":"","sources":["../../../../../../src/browser/contrib/merge-editor/view/editors/incomingCodeEditor.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAO1C,uCAYqB;AAErB,qDAAkD;AAG3C,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,+BAAc;IACpD,IAAW,eAAe;QACxB,OAAO,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC;IAC7D,CAAC;IAES,sBAAsB;QAC9B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAAC;IACtD,CAAC;IAES,mBAAmB;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;QACvD,OAAO,MAAM;aACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;aAC5B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,MAAM,MAAM,GAAG,GAAG,gCAAwB,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;YACxD,IAAI,WAAW,GAAG,6BAAqB,CAAC,IAAI,CAAC;YAE7C,IAAI,KAAK,CAAC,OAAO,EAAE;gBACjB,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACjF,IAAI,aAAa,IAAI,aAAa,CAAC,UAAU,EAAE;oBAC7C,WAAW,GAAG,6BAAqB,CAAC,WAAW,CAAC;iBACjD;aACF;YAED,OAAO;gBACL,KAAK;gBACL,iBAAiB,EAAE;oBACjB,oBAAoB,EAAE,6BAAqB,CAAC,OAAO,CACjD,6BAAqB,CAAC,KAAK,EAC3B,6BAAqB,CAAC,YAAY,EAClC,MAAM,CACP;oBACD,4BAA4B,EAAE,6BAAqB,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC;iBACjF;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,0BAA0B,CAC/B,cAAuC;QAEvC,OAAO;YACL,yBAAyB,EAAE,6BAAqB,CAAC,OAAO,CACtD,6BAAqB,CAAC,aAAa,EACnC,6BAAqB,CAAC,YAAY,EAClC,cAAc,CAAC,SAAS,IAAI,EAAE,CAC/B;YACD,SAAS,EAAE,6BAAqB,CAAC,OAAO,CAAC,6BAAqB,CAAC,YAAY,EAAE,cAAc,CAAC,SAAS,IAAI,EAAE,CAAC;SAC7G,CAAC;IACJ,CAAC;IAEM,iBAAiB;QACtB,OAAO,sBAAc,CAAC,QAAQ,CAAC;IACjC,CAAC;IAEe,0BAA0B,CAAC,SAAsD;QAC/F,KAAK,CAAC,0BAA0B,iCAC3B,SAAS,KACZ,YAAY,EAAE,sBAAc,CAAC,QAAQ,IACrC,CAAC;IACL,CAAC;IAEM,wBAAwB,CAAC,OAA4C;QAC1E,IAAI,CAAC,qBAAqB,CAAC,uCAAuC,CAAC,OAAO,CAAC,CAAC;QAC5E,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,uBAAuB,CAAC;YAC3B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,cAAc,EAAE,CAAC,KAAgB,EAAE,UAAwB,EAAE,EAAE;gBAC7D,IAAI,UAAU,KAAK,8BAAsB,IAAI,UAAU,KAAK,sBAAc,IAAI,UAAU,KAAK,sBAAc,EAAE;oBAC3G,IAAI,CAAC,0BAA0B,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,uBAAe,CAAC,UAAU,EAAE,CAAC,CAAC;iBACpG;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA1EY,kBAAkB;IAD9B,IAAA,eAAU,EAAC,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"incomingCodeEditor.js","sourceRoot":"","sources":["../../../../../../src/browser/contrib/merge-editor/view/editors/incomingCodeEditor.ts"],"names":[],"mappings":";;;;AAAA,qCAA0C;AAO1C,uCAYqB;AAErB,qDAAkD;AAG3C,IAAM,kBAAkB,GAAxB,MAAM,kBAAmB,SAAQ,+BAAc;IACpD,IAAW,eAAe;QACxB,OAAO,IAAI,CAAC,qBAAqB,CAAC,wBAAwB,CAAC;IAC7D,CAAC;IAES,sBAAsB;QAC9B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,oBAAoB,EAAE,EAAE,EAAE,CAAC;IACtD,CAAC;IAES,mBAAmB;QAC3B,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,CAAC;QACvD,OAAO,MAAM;aACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;aAC5B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,MAAM,MAAM,GAAG,GAAG,gCAAwB,GAAG,KAAK,CAAC,EAAE,EAAE,CAAC;YACxD,IAAI,WAAW,GAAG,6BAAqB,CAAC,IAAI,CAAC;YAE7C,IAAI,KAAK,CAAC,OAAO,EAAE;gBACjB,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,CAAC,uBAAuB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBACjF,IAAI,aAAa,IAAI,aAAa,CAAC,UAAU,EAAE;oBAC7C,WAAW,GAAG,6BAAqB,CAAC,WAAW,CAAC;iBACjD;aACF;YAED,OAAO;gBACL,KAAK;gBACL,iBAAiB,EAAE;oBACjB,oBAAoB,EAAE,6BAAqB,CAAC,OAAO,CACjD,6BAAqB,CAAC,KAAK,EAC3B,6BAAqB,CAAC,YAAY,EAClC,MAAM,CACP;oBACD,4BAA4B,EAAE,6BAAqB,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC;iBACjF;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,0BAA0B,CAC/B,cAAuC;QAEvC,OAAO;YACL,yBAAyB,EAAE,6BAAqB,CAAC,OAAO,CACtD,6BAAqB,CAAC,aAAa,EACnC,6BAAqB,CAAC,YAAY,EAClC,cAAc,CAAC,SAAS,IAAI,EAAE,CAC/B;YACD,SAAS,EAAE,6BAAqB,CAAC,OAAO,CAAC,6BAAqB,CAAC,YAAY,EAAE,cAAc,CAAC,SAAS,IAAI,EAAE,CAAC;SAC7G,CAAC;IACJ,CAAC;IAEM,iBAAiB;QACtB,OAAO,sBAAc,CAAC,QAAQ,CAAC;IACjC,CAAC;IAEe,0BAA0B,CAAC,SAAsD;QAC/F,KAAK,CAAC,0BAA0B,iCAC3B,SAAS,KACZ,YAAY,EAAE,sBAAc,CAAC,QAAQ,IACrC,CAAC;IACL,CAAC;IAEM,wBAAwB,CAAC,OAA4C;QAC1E,IAAI,CAAC,qBAAqB,CAAC,uCAAuC,CAAC,OAAO,CAAC,CAAC;QAC5E,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,IAAI,CAAC,uBAAuB,CAAC;YAC3B,mBAAmB,EAAE,IAAI,CAAC,mBAAmB;YAC7C,cAAc,EAAE,CAAC,KAAgB,EAAE,UAAwB,EAAE,EAAE;gBAC7D,IAAI,UAAU,KAAK,8BAAsB,IAAI,UAAU,KAAK,sBAAc,IAAI,UAAU,KAAK,sBAAc,EAAE;oBAC3G,IAAI,CAAC,0BAA0B,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,uBAAe,CAAC,UAAU,EAAE,CAAC,CAAC;iBACpG;YACH,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA1EY,kBAAkB;IAD9B,IAAA,eAAU,EAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;GACnB,kBAAkB,CA0E9B;AA1EY,gDAAkB"}
|
|
@@ -12,7 +12,6 @@ export declare class ResultCodeEditor extends BaseCodeEditor {
|
|
|
12
12
|
private readonly aiNativeConfigService;
|
|
13
13
|
private readonly mergeConflictReportService;
|
|
14
14
|
private readonly dataStore;
|
|
15
|
-
private readonly messageService;
|
|
16
15
|
private readonly _onDidChangeContent;
|
|
17
16
|
readonly onDidChangeContent: Event<void>;
|
|
18
17
|
private readonly _onChangeRangeIntelligentState;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resultCodeEditor.d.ts","sourceRoot":"","sources":["../../../../../../src/browser/contrib/merge-editor/view/editors/resultCodeEditor.ts"],"names":[],"mappings":"AAEA,OAAO,EAAyB,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAGL,uBAAuB,EAEvB,KAAK,EACL,aAAa,EAEd,MAAM,4BAA4B,CAAC;AAEpC,OAAO,EAEL,YAAY,EACZ,cAAc,EACd,wBAAwB,EACxB,gCAAgC,EAGjC,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"resultCodeEditor.d.ts","sourceRoot":"","sources":["../../../../../../src/browser/contrib/merge-editor/view/editors/resultCodeEditor.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,6 @@ const di_1 = require("@opensumi/di");
|
|
|
7
7
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
8
8
|
const conflict_report_service_1 = require("@opensumi/ide-core-browser/lib/ai-native/conflict-report.service");
|
|
9
9
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
10
|
-
const ide_overlay_1 = require("@opensumi/ide-overlay");
|
|
11
10
|
const position_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/core/position");
|
|
12
11
|
const format_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/contrib/format/browser/format");
|
|
13
12
|
const standaloneServices_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneServices");
|
|
@@ -18,7 +17,6 @@ const mapping_manager_store_1 = require("../../mapping-manager.store");
|
|
|
18
17
|
const inner_range_1 = require("../../model/inner-range");
|
|
19
18
|
const line_range_1 = require("../../model/line-range");
|
|
20
19
|
const time_machine_1 = require("../../model/time-machine");
|
|
21
|
-
const navigate_to_1 = require("../../navigate-to");
|
|
22
20
|
const types_1 = require("../../types");
|
|
23
21
|
const facotry_1 = require("../../widget/facotry");
|
|
24
22
|
const resolve_result_widget_1 = require("../../widget/resolve-result-widget");
|
|
@@ -581,37 +579,47 @@ let ResultCodeEditor = class ResultCodeEditor extends baseCodeEditor_1.BaseCodeE
|
|
|
581
579
|
if (visibleRanges.length === 0) {
|
|
582
580
|
return;
|
|
583
581
|
}
|
|
584
|
-
const allConflicts = this.mappingManagerService.getAllDiffRanges()
|
|
585
|
-
|
|
586
|
-
|
|
587
|
-
|
|
588
|
-
|
|
589
|
-
|
|
590
|
-
|
|
591
|
-
|
|
592
|
-
|
|
593
|
-
|
|
582
|
+
const allConflicts = this.mappingManagerService.getAllDiffRanges();
|
|
583
|
+
if (direction === NavigationDirection.Forwards) {
|
|
584
|
+
// 向上查找
|
|
585
|
+
const firstVisibleRange = visibleRanges[0];
|
|
586
|
+
const firstVisibleLineNumber = firstVisibleRange.startLineNumber;
|
|
587
|
+
// 找到 diff 的第一行比当前可视区域的第一行还要小的 range
|
|
588
|
+
for (let i = allConflicts.length - 1; i >= 0; i--) {
|
|
589
|
+
const range = allConflicts[i];
|
|
590
|
+
if (range.startLineNumber < firstVisibleLineNumber) {
|
|
591
|
+
return range;
|
|
592
|
+
}
|
|
593
|
+
}
|
|
594
|
+
return allConflicts[0];
|
|
594
595
|
}
|
|
595
|
-
else
|
|
596
|
-
//
|
|
597
|
-
|
|
596
|
+
else {
|
|
597
|
+
// 向下查找
|
|
598
|
+
const lastVisibleRange = visibleRanges[visibleRanges.length - 1];
|
|
599
|
+
const lastVisibleLineNumber = lastVisibleRange.endLineNumber;
|
|
600
|
+
// 找到 diff 的第一行比当前可视区域的最后一行还要大的 range
|
|
601
|
+
// eslint-disable-next-line @typescript-eslint/prefer-for-of
|
|
602
|
+
for (let i = 0; i < allConflicts.length; i++) {
|
|
603
|
+
const range = allConflicts[i];
|
|
604
|
+
if (range.startLineNumber > lastVisibleLineNumber) {
|
|
605
|
+
return range;
|
|
606
|
+
}
|
|
607
|
+
}
|
|
608
|
+
return allConflicts[allConflicts.length - 1];
|
|
598
609
|
}
|
|
599
|
-
return navigationResult.range;
|
|
600
610
|
}
|
|
601
611
|
navigate(direction) {
|
|
602
612
|
const range = this.findDiffRange(direction);
|
|
603
613
|
if (!range) {
|
|
604
614
|
return;
|
|
605
615
|
}
|
|
606
|
-
this.editor.
|
|
607
|
-
this.editor.revealRangeNearTopIfOutsideViewport(range);
|
|
608
|
-
this.editor.focus();
|
|
616
|
+
this.editor.revealLineInCenter(range.startLineNumber);
|
|
609
617
|
}
|
|
610
618
|
navigateForwards() {
|
|
611
|
-
this.navigate(
|
|
619
|
+
this.navigate(NavigationDirection.Forwards);
|
|
612
620
|
}
|
|
613
621
|
navigateBackwards() {
|
|
614
|
-
this.navigate(
|
|
622
|
+
this.navigate(NavigationDirection.Backwards);
|
|
615
623
|
}
|
|
616
624
|
};
|
|
617
625
|
tslib_1.__decorate([
|
|
@@ -626,13 +634,14 @@ tslib_1.__decorate([
|
|
|
626
634
|
(0, di_1.Autowired)(mapping_manager_store_1.MappingManagerDataStore),
|
|
627
635
|
tslib_1.__metadata("design:type", mapping_manager_store_1.MappingManagerDataStore)
|
|
628
636
|
], ResultCodeEditor.prototype, "dataStore", void 0);
|
|
629
|
-
tslib_1.__decorate([
|
|
630
|
-
(0, di_1.Autowired)(ide_overlay_1.IMessageService),
|
|
631
|
-
tslib_1.__metadata("design:type", Object)
|
|
632
|
-
], ResultCodeEditor.prototype, "messageService", void 0);
|
|
633
637
|
ResultCodeEditor = tslib_1.__decorate([
|
|
634
|
-
(0, di_1.Injectable)({ multiple:
|
|
638
|
+
(0, di_1.Injectable)({ multiple: false }),
|
|
635
639
|
tslib_1.__metadata("design:paramtypes", [HTMLDivElement, ide_core_browser_1.MonacoService, di_1.Injector])
|
|
636
640
|
], ResultCodeEditor);
|
|
637
641
|
exports.ResultCodeEditor = ResultCodeEditor;
|
|
642
|
+
var NavigationDirection;
|
|
643
|
+
(function (NavigationDirection) {
|
|
644
|
+
NavigationDirection[NavigationDirection["Forwards"] = 0] = "Forwards";
|
|
645
|
+
NavigationDirection[NavigationDirection["Backwards"] = 1] = "Backwards";
|
|
646
|
+
})(NavigationDirection || (NavigationDirection = {}));
|
|
638
647
|
//# sourceMappingURL=resultCodeEditor.js.map
|