@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
1
|
import { Disposable, IEventBus } from '@opensumi/ide-core-common';
|
|
2
|
+
import * as monaco from '@opensumi/ide-monaco';
|
|
2
3
|
import { IThemeService } from '@opensumi/ide-theme';
|
|
3
|
-
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
4
4
|
import { IDecorationApplyOptions, IDecorationRenderOptions } from '../common';
|
|
5
5
|
import { IEditorDecorationCollectionService } from './types';
|
|
6
6
|
import type { ICodeEditor as IMonacoCodeEditor } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decoration-applier.d.ts","sourceRoot":"","sources":["../../src/browser/decoration-applier.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAwB,MAAM,2BAA2B,CAAC;AACxF,OAAO,
|
|
1
|
+
{"version":3,"file":"decoration-applier.d.ts","sourceRoot":"","sources":["../../src/browser/decoration-applier.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAwB,MAAM,2BAA2B,CAAC;AACxF,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE9E,OAAO,EAKL,kCAAkC,EAEnC,MAAM,SAAS,CAAC;AAEjB,OAAO,KAAK,EAAE,WAAW,IAAI,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAE1G,qBACa,6BAA8B,SAAQ,UAAU;IAY/C,OAAO,CAAC,MAAM;IAV1B,iBAAiB,EAAE,kCAAkC,CAAC;IAGtD,YAAY,EAAE,aAAa,CAAC;IAG5B,QAAQ,EAAE,SAAS,CAAC;IAEpB,OAAO,CAAC,WAAW,CAA0E;gBAEzE,MAAM,EAAE,iBAAiB;IAyB7C,OAAO,CAAC,YAAY;YASN,2BAA2B;IAqBzC,OAAO;IAKP,gBAAgB;IAQhB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,qBAAqB,EAAE;IAiB/E,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,EAAE;IA6B/D,yBAAyB,CACvB,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,wBAAwB,GACjC;QAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC;QAAC,OAAO,EAAE,MAAM,IAAI,CAAA;KAAE;CAqB3E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decoration-applier.js","sourceRoot":"","sources":["../../src/browser/decoration-applier.ts"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAE7B,qCAAqD;AACrD,+DAAwF;
|
|
1
|
+
{"version":3,"file":"decoration-applier.js","sourceRoot":"","sources":["../../src/browser/decoration-applier.ts"],"names":[],"mappings":";;;;AAAA,oEAA6B;AAE7B,qCAAqD;AACrD,+DAAwF;AAExF,mDAAoD;AAIpD,mCAOiB;AAKV,IAAM,6BAA6B,GAAnC,MAAM,6BAA8B,SAAQ,4BAAU;IAY3D,YAAoB,MAAyB;QAC3C,KAAK,EAAE,CAAC;QADU,WAAM,GAAN,MAAM,CAAmB;QAFrC,gBAAW,GAAgE,IAAI,GAAG,EAAE,CAAC;QAI3F,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,GAAG,EAAE;YAChC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxB,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,mCAA2B,EAAE,CAAC,CAAC,EAAE,EAAE;YAClD,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;YACvC,IAAI,UAAU,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;gBACnD,IAAI,CAAC,2BAA2B,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;aACjD;QACH,CAAC,CAAC,CACH,CAAC;QACF,IAAI,CAAC,UAAU,CACb,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,wCAAgC,EAAE,CAAC,CAAC,EAAE,EAAE;YACvD,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACtC,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;YAC1B,MAAM,GAAG,GAAG,IAAI,qBAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5D,OAAO,GAAG,CAAC;SACZ;aAAM;YACL,OAAO,IAAI,CAAC;SACb;IACH,CAAC;IAEO,KAAK,CAAC,2BAA2B,CAAC,GAAY;QACpD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;YAC1B,MAAM,GAAG,GAAG,IAAI,qBAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC5D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;YAC9E,gCAAgC;YAChC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,GAAG,CAAC,QAAQ,EAAE,EAAE;gBACxF,OAAO;aACR;YAED,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBACnC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aACtC;YACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAChB,IAAI,4CAAoC,CAAC;gBACvC,GAAG;gBACH,GAAG;aACJ,CAAC,CACH,CAAC;SACH;IACH,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAC1B,CAAC;IAED,gBAAgB;QACd,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC7B,CAAC,CAAC,OAAO,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC;IAC3B,CAAC;IAED,eAAe,CAAC,GAAW,EAAE,WAAkD;QAC7E,IAAI,cAAc,GAAa,EAAE,CAAC;QAClC,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC7B,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,WAAW,CAAC;YACxD,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC,OAAO,EAAE,CAAC;YACrC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC9B;QACD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3D,OAAO;SACR;QACD,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAChF,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE;YACxB,WAAW,EAAE,aAAa;YAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI;SACpB,CAAC,CAAC;IACL,CAAC;IAED,eAAe,CAAC,GAAW,EAAE,OAAkC;QAC7D,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,cAAc,EAAE;YAClB,cAAc,CAAC,OAAO,EAAE,CAAC;SAC1B;QACD,MAAM,SAAS,GAAG,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;QACnE,MAAM,cAAc,GAA0C,EAAE,CAAC;QACjE,MAAM,QAAQ,GAAG,IAAI,4BAAU,EAAE,CAAC;QAClC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;YAClD,OAAO;SACR;QACD,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACzB,MAAM,QAAQ,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;YAC3E,cAAc,CAAC,IAAI,CAAC;gBAClB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,OAAO,kCACF,QAAQ,CAAC,OAAO,KACnB,YAAY,EAAE,mBAAmB,CAAC,MAAM,CAAC,YAAY,CAAC,GACvD;aACF,CAAC,CAAC;YACH,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACvE,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,EAAE;YACxB,WAAW,EAAE,MAAM;YACnB,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE;SAClC,CAAC,CAAC;IACL,CAAC;IAED,yBAAyB,CACvB,GAAW,EACX,OAAkC;QAElC,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,CAAC,2BAA2B,CAAC,GAAG,CAAC,CAAC;QACrE,MAAM,MAAM,GAA0C;YACpD,WAAW,EAAE,GAAG;SACjB,CAAC;QACF,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC,mBAAmB,EAAE,CAAC,IAAI,CAAC;QAClE,MAAM,QAAQ,GAAG,IAAI,4BAAU,EAAE,CAAC;QAClC,IAAI,IAAI,EAAE;YACR,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC/B,4BAA4B,CAAC,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;SAC9D;QACD,IAAI,OAAO,EAAE;YACX,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,8BAA8B,CAAC,OAAO,CAAC,CAAC;YAChF,4BAA4B,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YACtE,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;SAC/B;QACD,OAAO;YACL,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE;SAClC,CAAC;IACJ,CAAC;CACF,CAAA;AArJC;IAAC,IAAA,cAAS,EAAC,0CAAkC,CAAC;;wEACQ;AAEtD;IAAC,IAAA,cAAS,EAAC,yBAAa,CAAC;;mEACG;AAE5B;IAAC,IAAA,cAAS,EAAC,2BAAS,CAAC;;+DACD;AART,6BAA6B;IADzC,IAAA,eAAU,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;GAClB,6BAA6B,CAsJzC;AAtJY,sEAA6B;AAwJ1C,SAAS,4BAA4B,CACnC,MAA6C,EAC7C,QAAyC,EACzC,YAAiE;IAEjE,IAAI,QAAQ,CAAC,iBAAiB,EAAE;QAC9B,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACzB,MAAM,CAAC,aAAa,GAAG;gBACrB,KAAK,EAAE,IAAW;gBAClB,QAAQ,EAAE,QAAQ,CAAC,iBAAiB;aACrC,CAAC;SACH;aAAM;YACL,MAAM,CAAC,aAAa,CAAC,QAAQ,GAAG,QAAQ,CAAC,iBAAiB,CAAC;SAC5D;KACF;IAED,IAAI,QAAQ,CAAC,OAAO,EAAE;QACpB,0BAA0B,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;KACtD;IACD,IAAI,YAAY,KAAK,MAAM,IAAI,QAAQ,CAAC,IAAI,EAAE;QAC5C,0BAA0B,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;KACnD;IACD,IAAI,YAAY,KAAK,OAAO,IAAI,QAAQ,CAAC,KAAK,EAAE;QAC9C,0BAA0B,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;KACpD;IAED,IAAI,QAAQ,CAAC,WAAW,KAAK,SAAS,EAAE;QACtC,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAC,WAAW,CAAC;KAC3C;IAED,IAAI,QAAQ,CAAC,aAAa,EAAE;QAC1B,MAAM,CAAC,UAAU,GAAG,QAAQ,CAAC,aAAuB,CAAC;KACtD;IAED,MAAM,CAAC,mCAAmC,GAAG,IAAI,CAAC;AACpD,CAAC;AAED,SAAS,0BAA0B,CAAC,MAA6C,EAAE,KAAsB;IACvG,IAAI,KAAK,CAAC,SAAS,EAAE;QACnB,MAAM,CAAC,SAAS,GAAG,IAAA,oBAAG,EAAC,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;KAC3D;IACD,IAAI,KAAK,CAAC,eAAe,EAAE;QACzB,MAAM,CAAC,eAAe,GAAG,IAAA,oBAAG,EAAC,MAAM,CAAC,eAAe,EAAE,KAAK,CAAC,eAAe,CAAC,CAAC;KAC7E;IACD,IAAI,KAAK,CAAC,qBAAqB,EAAE;QAC/B,MAAM,CAAC,qBAAqB,GAAG,IAAA,oBAAG,EAAC,MAAM,CAAC,qBAAqB,EAAE,KAAK,CAAC,qBAAqB,CAAC,CAAC;KAC/F;IACD,IAAI,KAAK,CAAC,sBAAsB,EAAE;QAChC,MAAM,CAAC,sBAAsB,GAAG,IAAA,oBAAG,EAAC,MAAM,CAAC,sBAAsB,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAC;KAClG;IACD,IAAI,KAAK,CAAC,oBAAoB,EAAE;QAC9B,MAAM,CAAC,oBAAoB,GAAG,IAAA,oBAAG,EAAC,MAAM,CAAC,oBAAoB,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;KAC5F;IACD,IAAI,KAAK,CAAC,kBAAkB,EAAE;QAC5B,IAAI,MAAM,CAAC,aAAa,EAAE;YACxB,MAAM,CAAC,aAAa,CAAC,KAAK,GAAG,KAAK,CAAC,kBAAkB,CAAC;SACvD;KACF;AACH,CAAC;AAED,SAAS,mBAAmB,CAC1B,GAA6D;IAE7D,IAAI,CAAC,GAAG,EAAE;QACR,OAAO,SAAS,CAAC;KAClB;IACD,IAAI,GAAG,YAAY,KAAK,EAAE;QACxB,OAAO,GAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC;KAClC;SAAM;QACL,OAAO,gBAAgB,CAAC,GAAG,CAAC,CAAC;KAC9B;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,GAA6B;IACrD,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,OAAO;YACL,KAAK,EAAE,GAAG;YACV,SAAS,EAAE,IAAI;SAChB,CAAC;KACH;SAAM;QACL,OAAO,GAAG,CAAC;KACZ;AACH,CAAC"}
|
|
@@ -7,7 +7,8 @@ export declare class CompareService implements ICompareService {
|
|
|
7
7
|
compare(original: URI, modified: URI, name: string): Promise<CompareResult>;
|
|
8
8
|
}
|
|
9
9
|
export declare class CompareEditorContribution implements MenuContribution, CommandContribution {
|
|
10
|
-
compareService
|
|
10
|
+
private compareService;
|
|
11
|
+
private preferenceService;
|
|
11
12
|
registerMenus(menu: IMenuRegistry): void;
|
|
12
13
|
registerCommands(commands: CommandRegistry): void;
|
|
13
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compare.d.ts","sourceRoot":"","sources":["../../../src/browser/diff/compare.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,eAAe,
|
|
1
|
+
{"version":3,"file":"compare.d.ts","sourceRoot":"","sources":["../../../src/browser/diff/compare.ts"],"names":[],"mappings":"AACA,OAAO,EACL,mBAAmB,EACnB,eAAe,EAGf,QAAQ,EAIR,GAAG,EAGJ,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAU,MAAM,0CAA0C,CAAC;AAEnG,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE1D,qBACa,cAAe,YAAW,eAAe;IACpD,SAAgB,SAAS,uCAA8C;IAGvE,OAAO,CAAC,cAAc,CAAiB;IAEvC,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;CAqB5E;AAED,qBACa,yBAA0B,YAAW,gBAAgB,EAAE,mBAAmB;IAErF,OAAO,CAAC,cAAc,CAAiB;IAGvC,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,aAAa,CAAC,IAAI,EAAE,aAAa;IAqCjC,gBAAgB,CAAC,QAAQ,EAAE,eAAe;CAsB3C"}
|
|
@@ -45,7 +45,7 @@ let CompareEditorContribution = class CompareEditorContribution {
|
|
|
45
45
|
menu.registerMenuItems(next_1.MenuId.EditorTitle, [
|
|
46
46
|
{
|
|
47
47
|
command: {
|
|
48
|
-
id:
|
|
48
|
+
id: ide_core_browser_1.DIFF_EDITOR_COMMANDS.ACCEPT.id,
|
|
49
49
|
label: (0, ide_core_browser_1.localize)('editor.action.accept'),
|
|
50
50
|
},
|
|
51
51
|
iconClass: (0, ide_core_browser_1.getIcon)('check'),
|
|
@@ -56,7 +56,7 @@ let CompareEditorContribution = class CompareEditorContribution {
|
|
|
56
56
|
menu.registerMenuItems(next_1.MenuId.EditorTitle, [
|
|
57
57
|
{
|
|
58
58
|
command: {
|
|
59
|
-
id:
|
|
59
|
+
id: ide_core_browser_1.DIFF_EDITOR_COMMANDS.REVERT.id,
|
|
60
60
|
label: (0, ide_core_browser_1.localize)('editor.action.revert'),
|
|
61
61
|
},
|
|
62
62
|
iconClass: (0, ide_core_browser_1.getIcon)('rollback'),
|
|
@@ -64,28 +64,50 @@ let CompareEditorContribution = class CompareEditorContribution {
|
|
|
64
64
|
when: 'isInDiffEditor && diffResource =~ /%26comparing%3Dtrue$/',
|
|
65
65
|
},
|
|
66
66
|
]);
|
|
67
|
+
menu.registerMenuItems(next_1.MenuId.EditorTitle, [
|
|
68
|
+
{
|
|
69
|
+
command: {
|
|
70
|
+
id: ide_core_browser_1.DIFF_EDITOR_COMMANDS.TOGGLE_COLLAPSE_UNCHANGED_REGIONS.id,
|
|
71
|
+
label: (0, ide_core_browser_1.localize)('diffEditor.action.toggleCollapseUnchangedRegions'),
|
|
72
|
+
},
|
|
73
|
+
toggledWhen: 'config.diffEditor.hideUnchangedRegions.enabled',
|
|
74
|
+
iconClass: 'codicon codicon-map',
|
|
75
|
+
group: 'navigation',
|
|
76
|
+
when: 'isInDiffEditor',
|
|
77
|
+
},
|
|
78
|
+
]);
|
|
67
79
|
}
|
|
68
80
|
registerCommands(commands) {
|
|
69
|
-
commands.registerCommand(
|
|
81
|
+
commands.registerCommand(ide_core_browser_1.DIFF_EDITOR_COMMANDS.ACCEPT, {
|
|
70
82
|
execute: (uri) => {
|
|
71
83
|
if (uri && this.compareService.comparing.has(uri.toString())) {
|
|
72
84
|
this.compareService.comparing.get(uri.toString()).resolve(types_1.CompareResult.accept);
|
|
73
85
|
}
|
|
74
86
|
},
|
|
75
87
|
});
|
|
76
|
-
commands.registerCommand(
|
|
88
|
+
commands.registerCommand(ide_core_browser_1.DIFF_EDITOR_COMMANDS.REVERT, {
|
|
77
89
|
execute: (uri) => {
|
|
78
90
|
if (uri && this.compareService.comparing.has(uri.toString())) {
|
|
79
91
|
this.compareService.comparing.get(uri.toString()).resolve(types_1.CompareResult.revert);
|
|
80
92
|
}
|
|
81
93
|
},
|
|
82
94
|
});
|
|
95
|
+
commands.registerCommand(ide_core_browser_1.DIFF_EDITOR_COMMANDS.TOGGLE_COLLAPSE_UNCHANGED_REGIONS, {
|
|
96
|
+
execute: () => {
|
|
97
|
+
const enabled = this.preferenceService.get('diffEditor.hideUnchangedRegions.enabled');
|
|
98
|
+
this.preferenceService.set('diffEditor.hideUnchangedRegions.enabled', !enabled);
|
|
99
|
+
},
|
|
100
|
+
});
|
|
83
101
|
}
|
|
84
102
|
};
|
|
85
103
|
tslib_1.__decorate([
|
|
86
104
|
(0, di_1.Autowired)(types_1.ICompareService),
|
|
87
105
|
tslib_1.__metadata("design:type", CompareService)
|
|
88
106
|
], CompareEditorContribution.prototype, "compareService", void 0);
|
|
107
|
+
tslib_1.__decorate([
|
|
108
|
+
(0, di_1.Autowired)(ide_core_browser_1.PreferenceService),
|
|
109
|
+
tslib_1.__metadata("design:type", Object)
|
|
110
|
+
], CompareEditorContribution.prototype, "preferenceService", void 0);
|
|
89
111
|
CompareEditorContribution = tslib_1.__decorate([
|
|
90
112
|
(0, ide_core_browser_1.Domain)(next_1.MenuContribution, ide_core_browser_1.CommandContribution)
|
|
91
113
|
], CompareEditorContribution);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compare.js","sourceRoot":"","sources":["../../../src/browser/diff/compare.ts"],"names":[],"mappings":";;;;AAAA,qCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"compare.js","sourceRoot":"","sources":["../../../src/browser/diff/compare.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-document-model.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/editor-document-model.ts"],"names":[],"mappings":"AAGA,OAAO,EAEL,UAAU,
|
|
1
|
+
{"version":3,"file":"editor-document-model.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/editor-document-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -472,7 +472,7 @@ let EditorDocumentModel = EditorDocumentModel_1 = class EditorDocumentModel exte
|
|
|
472
472
|
reject(err);
|
|
473
473
|
}, formatOnSaveTimeout);
|
|
474
474
|
}),
|
|
475
|
-
this.commandService.executeCommand(
|
|
475
|
+
this.commandService.executeCommand(ide_core_browser_1.EDITOR_COMMANDS.FORMAT_DOCUMENT.id),
|
|
476
476
|
]);
|
|
477
477
|
}
|
|
478
478
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-document-model.js","sourceRoot":"","sources":["../../../src/browser/doc-model/editor-document-model.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"editor-document-model.js","sourceRoot":"","sources":["../../../src/browser/doc-model/editor-document-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
+
import * as monaco from '@opensumi/ide-monaco';
|
|
1
2
|
import { ITextModelContentProvider, ITextModelService } from '@opensumi/monaco-editor-core/esm/vs/editor/common/services/resolverService';
|
|
2
|
-
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
3
3
|
import { IEditorDocumentModelService } from './types';
|
|
4
4
|
export declare class MonacoTextModelService implements ITextModelService {
|
|
5
5
|
canHandleResource(resource: any): boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"override.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/override.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"override.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/override.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAClB,MAAM,4EAA4E,CAAC;AAEpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,SAAS,CAAC;AAEtD,qBACa,sBAAuB,YAAW,iBAAiB;IAC9D,iBAAiB,CAAC,QAAQ,EAAE,GAAG,GAAG,OAAO;IAIzC,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO;IAIpD,aAAa,EAAE,SAAS,CAAC;IAGzB,oBAAoB,EAAE,2BAA2B,CAAC;IAE5C,oBAAoB,CAAC,QAAQ,EAAE,MAAM,CAAC,GAAG;IAe/C,gCAAgC,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,yBAAyB,GAAG,MAAM,CAAC,WAAW;CAO1G"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveParticipants.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EAWrB,YAAY,EAEb,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"saveParticipants.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EAWrB,YAAY,EAEb,MAAM,4BAA4B,CAAC;AAuBpC,OAAO,EAAE,gCAAgC,EAA+B,MAAM,SAAS,CAAC;AAoBxF,qBACa,2BAA4B,SAAQ,YAAY;IAE3D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAgC;IAGxE,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAiB;IAGhD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IAGzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAmB;IAEnD,IAAI,eAAe,IAAI,GAAG,CAEzB;IAED,QAAQ;IAKF,6BAA6B,CAAC,CAAC,EAAE,gCAAgC;YA+FzD,kBAAkB;YAoClB,gBAAgB;YAchB,eAAe;CAoB9B;AAED,qBACa,4BAA6B,SAAQ,YAAY;IAE5D,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IAGtD,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA8B;IAGzD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAGjC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAW;IAEpC,QAAQ;IAKF,6BAA6B,CAAC,CAAC,EAAE,gCAAgC;IAevE;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAY5B,OAAO,CAAC,mBAAmB;CAuC5B;AAED,qBACa,4BAA6B,YAAW,qBAAqB;IAExE,2BAA2B,EAAE,2BAA2B,CAAC;IAGzD,4BAA4B,EAAE,4BAA4B,CAAC;IAE3D,OAAO;CAIR"}
|
|
@@ -5,14 +5,14 @@ const tslib_1 = require("tslib");
|
|
|
5
5
|
const di_1 = require("@opensumi/di");
|
|
6
6
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
7
7
|
const progress_1 = require("@opensumi/ide-core-browser/lib/progress");
|
|
8
|
+
const monaco = tslib_1.__importStar(require("@opensumi/ide-monaco"));
|
|
8
9
|
const monaco_api_1 = require("@opensumi/ide-monaco/lib/browser/monaco-api");
|
|
9
10
|
const languages_1 = require("@opensumi/ide-monaco/lib/browser/monaco-api/languages");
|
|
10
11
|
const editOperation_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/core/editOperation");
|
|
11
12
|
const range_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/common/core/range");
|
|
12
13
|
const languages = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/common/languages"));
|
|
13
14
|
const codeAction_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/browser/codeAction");
|
|
14
|
-
const types_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/
|
|
15
|
-
const monaco = tslib_1.__importStar(require("@opensumi/monaco-editor-core/esm/vs/editor/editor.api"));
|
|
15
|
+
const types_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/contrib/codeAction/common/types");
|
|
16
16
|
const editor_override_1 = require("../editor.override");
|
|
17
17
|
const types_2 = require("../types");
|
|
18
18
|
const types_3 = require("./types");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"saveParticipants.js","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":";;;;AAAA,qCAA+E;AAC/E,iEAcoC;AACpC,sEAA2E;AAC3E,4EAA2E;AAC3E,qFAAgG;AAKhG,wGAAqG;AACrG,wFAAqF;AACrF,+GAAyF;AAEzF,
|
|
1
|
+
{"version":3,"file":"saveParticipants.js","sourceRoot":"","sources":["../../../src/browser/doc-model/saveParticipants.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { BasicEvent, Event, IDisposable, IEditOperation, IEditorDocumentChange, IEditorDocumentModelSaveResult, MaybePromise, URI } from '@opensumi/ide-core-browser';
|
|
2
|
+
import * as monaco from '@opensumi/ide-monaco';
|
|
2
3
|
import { EOL, EndOfLineSequence } from '@opensumi/ide-monaco/lib/browser/monaco-api/types';
|
|
3
|
-
import * as monaco from '@opensumi/monaco-editor-core/esm/vs/editor/editor.api';
|
|
4
4
|
import { IEditorDocumentModelContentChange, SaveReason } from '../../common';
|
|
5
5
|
import { IEditorDocumentModel, IEditorDocumentModelRef } from '../../common/editor';
|
|
6
6
|
export interface IDocModelUpdateOptions extends monaco.editor.ITextModelUpdateOptions {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,KAAK,EACL,WAAW,EACX,cAAc,EACd,qBAAqB,EACrB,8BAA8B,EAC9B,YAAY,EACZ,GAAG,EACJ,MAAM,4BAA4B,CAAC;AACpC,OAAO,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/browser/doc-model/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Injector } from '@opensumi/di';
|
|
2
|
-
import { IContextKeyService, IRange } from '@opensumi/ide-core-browser';
|
|
2
|
+
import { IContextKeyService, IRange, PreferenceService } from '@opensumi/ide-core-browser';
|
|
3
3
|
import { MonacoService } from '@opensumi/ide-core-browser/lib/monaco';
|
|
4
4
|
import { Disposable, ILineChange, URI, WithEventBus } from '@opensumi/ide-core-common';
|
|
5
|
-
import * as monaco from '@opensumi/monaco
|
|
5
|
+
import * as monaco from '@opensumi/ide-monaco';
|
|
6
6
|
import { IConfigurationService } from '@opensumi/monaco-editor-core/esm/vs/platform/configuration/common/configuration';
|
|
7
7
|
import { CursorStatus, EditorCollectionService, EditorType, ICodeEditor, IDecorationApplyOptions, IDiffEditor, IEditor, IResourceOpenOptions, IUndoStopOptions } from '../common';
|
|
8
8
|
import { IEditorDocumentModel, IEditorDocumentModelRef } from '../common/editor';
|
|
@@ -51,9 +51,9 @@ export declare abstract class BaseMonacoEditorWrapper extends WithEventBus imple
|
|
|
51
51
|
abstract readonly currentDocumentModel: IEditorDocumentModel | null;
|
|
52
52
|
get currentUri(): URI | null;
|
|
53
53
|
getId(): string;
|
|
54
|
-
getSelections():
|
|
55
|
-
onFocus:
|
|
56
|
-
onBlur:
|
|
54
|
+
getSelections(): monaco.Selection[];
|
|
55
|
+
onFocus: monaco.Event<void>;
|
|
56
|
+
onBlur: monaco.Event<void>;
|
|
57
57
|
protected _specialEditorOptions: any;
|
|
58
58
|
protected _specialModelOptions: monaco.editor.ITextModelUpdateOptions;
|
|
59
59
|
protected _editorOptionsFromContribution: any;
|
|
@@ -121,6 +121,7 @@ export declare class BrowserDiffEditor extends WithEventBus implements IDiffEdit
|
|
|
121
121
|
_disposed: boolean;
|
|
122
122
|
protected readonly injector: Injector;
|
|
123
123
|
protected readonly configurationService: IConfigurationService;
|
|
124
|
+
protected readonly preferenceService: PreferenceService;
|
|
124
125
|
protected readonly contextKeyService: IContextKeyService;
|
|
125
126
|
private editorState;
|
|
126
127
|
private currentUri;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"editor-collection.service.d.ts","sourceRoot":"","sources":["../../src/browser/editor-collection.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"editor-collection.service.d.ts","sourceRoot":"","sources":["../../src/browser/editor-collection.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
|
7
7
|
const contextkey_1 = require("@opensumi/ide-core-browser/lib/contextkey");
|
|
8
8
|
const monaco_1 = require("@opensumi/ide-core-browser/lib/monaco");
|
|
9
9
|
const ide_core_common_1 = require("@opensumi/ide-core-common");
|
|
10
|
-
const monaco = tslib_1.__importStar(require("@opensumi/monaco
|
|
10
|
+
const monaco = tslib_1.__importStar(require("@opensumi/ide-monaco"));
|
|
11
11
|
const configuration_1 = require("@opensumi/monaco-editor-core/esm/vs/platform/configuration/common/configuration");
|
|
12
12
|
const common_1 = require("../common");
|
|
13
13
|
const decoration_applier_1 = require("./decoration-applier");
|
|
@@ -201,7 +201,7 @@ let BaseMonacoEditorWrapper = class BaseMonacoEditorWrapper extends ide_core_com
|
|
|
201
201
|
this._doUpdateOptions();
|
|
202
202
|
}));
|
|
203
203
|
this.addDispose(this.configurationService.onDidChangeConfiguration((e) => {
|
|
204
|
-
const changedEditorKeys = e.affectedKeys.filter((key) => (0, converter_1.isEditorOption)(key));
|
|
204
|
+
const changedEditorKeys = Array.from(e.affectedKeys.values()).filter((key) => (0, converter_1.isEditorOption)(key));
|
|
205
205
|
if (changedEditorKeys.length > 0) {
|
|
206
206
|
this._doUpdateOptions();
|
|
207
207
|
}
|
|
@@ -468,7 +468,7 @@ class BrowserDiffEditor extends ide_core_common_1.WithEventBus {
|
|
|
468
468
|
this.editorState = new Map();
|
|
469
469
|
this.wrapEditors();
|
|
470
470
|
this.addDispose(this.configurationService.onDidChangeConfiguration((e) => {
|
|
471
|
-
const changedEditorKeys = e.affectedKeys.filter((key) => (0, converter_1.isDiffEditorOption)(key));
|
|
471
|
+
const changedEditorKeys = Array.from(e.affectedKeys.values()).filter((key) => (0, converter_1.isDiffEditorOption)(key));
|
|
472
472
|
if (changedEditorKeys.length > 0) {
|
|
473
473
|
this.doUpdateDiffOptions();
|
|
474
474
|
}
|
|
@@ -522,7 +522,9 @@ class BrowserDiffEditor extends ide_core_common_1.WithEventBus {
|
|
|
522
522
|
else {
|
|
523
523
|
this.restoreState();
|
|
524
524
|
}
|
|
525
|
-
|
|
525
|
+
const enableHideUnchanged = this.preferenceService.get('diffEditor.hideUnchangedRegions.enabled');
|
|
526
|
+
if (options.revealFirstDiff && !enableHideUnchanged) {
|
|
527
|
+
// 仅在非折叠模式下自动滚动到第一个 Diff
|
|
526
528
|
const diffs = this.monacoDiffEditor.getLineChanges();
|
|
527
529
|
if (diffs && diffs.length > 0) {
|
|
528
530
|
this.showFirstDiff();
|
|
@@ -647,6 +649,10 @@ tslib_1.__decorate([
|
|
|
647
649
|
(0, di_1.Autowired)(configuration_1.IConfigurationService),
|
|
648
650
|
tslib_1.__metadata("design:type", Object)
|
|
649
651
|
], BrowserDiffEditor.prototype, "configurationService", void 0);
|
|
652
|
+
tslib_1.__decorate([
|
|
653
|
+
(0, di_1.Autowired)(ide_core_browser_1.PreferenceService),
|
|
654
|
+
tslib_1.__metadata("design:type", Object)
|
|
655
|
+
], BrowserDiffEditor.prototype, "preferenceService", void 0);
|
|
650
656
|
tslib_1.__decorate([
|
|
651
657
|
(0, di_1.Autowired)(ide_core_browser_1.IContextKeyService),
|
|
652
658
|
tslib_1.__metadata("design:type", Object)
|