@opensumi/ide-monaco 3.9.1-next-1748403761.0 → 3.9.1-next-1748425167.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/contrib/multi-diff-editor/resource-label.d.ts +1 -2
- package/lib/browser/contrib/multi-diff-editor/resource-label.d.ts.map +1 -1
- package/lib/browser/contrib/multi-diff-editor/resource-label.js +4 -12
- package/lib/browser/contrib/multi-diff-editor/resource-label.js.map +1 -1
- package/lib/browser/contrib/multi-diff-editor/resource-label.module.less +0 -18
- package/lib/browser/monaco.service.d.ts +0 -1
- package/lib/browser/monaco.service.d.ts.map +1 -1
- package/lib/browser/monaco.service.js +2 -7
- package/lib/browser/monaco.service.js.map +1 -1
- package/package.json +11 -11
- package/src/browser/contrib/multi-diff-editor/resource-label.module.less +0 -18
- package/src/browser/contrib/multi-diff-editor/resource-label.ts +6 -17
- package/src/browser/monaco.service.ts +2 -7
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { Uri } from '@opensumi/ide-core-browser';
|
|
2
|
-
import { IWorkspaceService } from '@opensumi/ide-workspace';
|
|
3
2
|
import { IResourceLabelOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory';
|
|
4
3
|
export declare class ResourceLabel {
|
|
5
4
|
private readonly element;
|
|
6
5
|
constructor(element: HTMLElement);
|
|
7
|
-
setUri(uri: Uri,
|
|
6
|
+
setUri(uri: Uri, options?: IResourceLabelOptions): void;
|
|
8
7
|
private renderFile;
|
|
9
8
|
clear(): void;
|
|
10
9
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-label.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/multi-diff-editor/resource-label.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,GAAG,EAAwB,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"resource-label.d.ts","sourceRoot":"","sources":["../../../../src/browser/contrib/multi-diff-editor/resource-label.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,GAAG,EAAwB,MAAM,4BAA4B,CAAC;AAC5E,OAAO,EAAE,qBAAqB,EAAE,MAAM,qGAAqG,CAAC;AAI5I,qBAAa,aAAa;IACZ,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,WAAW;IAEjD,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,qBAAqB;IAIhD,OAAO,CAAC,UAAU;IAOlB,KAAK;CAGN"}
|
|
@@ -8,20 +8,12 @@ class ResourceLabel {
|
|
|
8
8
|
constructor(element) {
|
|
9
9
|
this.element = element;
|
|
10
10
|
}
|
|
11
|
-
setUri(uri,
|
|
12
|
-
this.renderFile(ide_core_browser_1.URI.from(uri),
|
|
11
|
+
setUri(uri, options) {
|
|
12
|
+
this.renderFile(ide_core_browser_1.URI.from(uri), options);
|
|
13
13
|
}
|
|
14
|
-
renderFile(uri,
|
|
14
|
+
renderFile(uri, options) {
|
|
15
15
|
const icon = (0, ide_core_browser_1.getResourceIconClass)(uri);
|
|
16
|
-
|
|
17
|
-
const pathWithoutFileName = (relativePath === null || relativePath === void 0 ? void 0 : relativePath.path)
|
|
18
|
-
? relativePath.path.substring(0, relativePath.path.lastIndexOf('/'))
|
|
19
|
-
: '';
|
|
20
|
-
const relativePathElement = pathWithoutFileName
|
|
21
|
-
? `<span class="${resource_label_module_less_1.default.relativePath} ${resource_label_module_less_1.default.ellipsisPath}">${pathWithoutFileName}</span>`
|
|
22
|
-
: '';
|
|
23
|
-
this.element.innerHTML = `<span class="${resource_label_module_less_1.default.resourceLabel}${(options === null || options === void 0 ? void 0 : options.strikethrough) ? ` ${resource_label_module_less_1.default.strikethrough}` : ''}"><span class="${icon.iconClass}"></span>${uri.displayName}${relativePathElement}</span>`;
|
|
24
|
-
});
|
|
16
|
+
this.element.innerHTML = `<span class="${resource_label_module_less_1.default.resourceLabel}${(options === null || options === void 0 ? void 0 : options.strikethrough) ? ' strikethrough' : ''}"><span class="${icon.iconClass}"></span>${uri.displayName}</span>`;
|
|
25
17
|
}
|
|
26
18
|
clear() {
|
|
27
19
|
this.element.innerHTML = '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-label.js","sourceRoot":"","sources":["../../../../src/browser/contrib/multi-diff-editor/resource-label.ts"],"names":[],"mappings":";;;;AAAA,iEAA4E;
|
|
1
|
+
{"version":3,"file":"resource-label.js","sourceRoot":"","sources":["../../../../src/browser/contrib/multi-diff-editor/resource-label.ts"],"names":[],"mappings":";;;;AAAA,iEAA4E;AAG5E,sGAAkD;AAElD,MAAa,aAAa;IACxB,YAA6B,OAAoB;QAApB,YAAO,GAAP,OAAO,CAAa;IAAG,CAAC;IAErD,MAAM,CAAC,GAAQ,EAAE,OAA+B;QAC9C,IAAI,CAAC,UAAU,CAAC,sBAAG,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IAEO,UAAU,CAAC,GAAQ,EAAE,OAA+B;QAC1D,MAAM,IAAI,GAAG,IAAA,uCAAoB,EAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,gBAAgB,oCAAM,CAAC,aAAa,GAC3D,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,aAAa,EAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAC9C,kBAAkB,IAAI,CAAC,SAAS,YAAY,GAAG,CAAC,WAAW,SAAS,CAAC;IACvE,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,SAAS,GAAG,EAAE,CAAC;IAC9B,CAAC;CACF;AAjBD,sCAiBC"}
|
|
@@ -3,21 +3,3 @@
|
|
|
3
3
|
align-items: center;
|
|
4
4
|
gap: 4px;
|
|
5
5
|
}
|
|
6
|
-
|
|
7
|
-
.strikethrough {
|
|
8
|
-
text-decoration: line-through;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
.relativePath {
|
|
12
|
-
font-size: 12px;
|
|
13
|
-
color: var(--descriptionForeground);
|
|
14
|
-
margin-left: 4px;
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
.ellipsisPath {
|
|
18
|
-
white-space: nowrap;
|
|
19
|
-
overflow: hidden;
|
|
20
|
-
text-overflow: ellipsis;
|
|
21
|
-
direction: rtl;
|
|
22
|
-
text-align: left;
|
|
23
|
-
}
|
|
@@ -13,7 +13,6 @@ export default class MonacoServiceImpl extends Disposable implements MonacoServi
|
|
|
13
13
|
private readonly overrideServiceRegistry;
|
|
14
14
|
private readonly keybindingRegistry;
|
|
15
15
|
protected readonly keybindingService: KeybindingService;
|
|
16
|
-
private readonly workspaceService;
|
|
17
16
|
private readonly logger;
|
|
18
17
|
get monacoBaseOptions(): IStandaloneEditorConstructionOptions;
|
|
19
18
|
createCodeEditor(monacoContainer: HTMLElement, options?: IEditorConstructionOptions, overrides?: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco.service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EACL,UAAU,EAGV,iBAAiB,EAEjB,YAAY,EAEb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2DAA2D,CAAC;
|
|
1
|
+
{"version":3,"file":"monaco.service.d.ts","sourceRoot":"","sources":["../../src/browser/monaco.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyC,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC/E,OAAO,EACL,UAAU,EAGV,iBAAiB,EAEjB,YAAY,EAEb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2DAA2D,CAAC;AAE/F,OAAO,EAAE,0BAA0B,EAAE,MAAM,+EAA+E,CAAC;AAC3H,OAAO,EACL,8BAA8B,EAG/B,MAAM,kEAAkE,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,iGAAiG,CAAC;AAGxI,OAAO,EAAE,oCAAoC,EAAE,MAAM,oFAAoF,CAAC;AAM1I,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAM1C,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAM9D,MAAM,CAAC,OAAO,OAAO,iBAAkB,SAAQ,UAAW,YAAW,aAAa;IAEhF,SAAS,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAG7B,OAAO,CAAC,eAAe,CAA4B;IAGnD,OAAO,CAAC,QAAQ,CAAC,uBAAuB,CAAgC;IAGxE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAqB;IAGxD,SAAS,CAAC,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAGxD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IAEjC,IAAI,iBAAiB,IAWd,oCAAoC,CAC1C;IAEM,gBAAgB,CACrB,eAAe,EAAE,WAAW,EAC5B,OAAO,CAAC,EAAE,0BAA0B,EACpC,SAAS,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO,GACrC,WAAW;IAkBd,OAAO,CAAC,uBAAuB;IAsB/B,OAAO,CAAC,6BAA6B;IAarC,OAAO,CAAC,qBAAqB;IAatB,gBAAgB,CACrB,eAAe,EAAE,WAAW,EAC5B,OAAO,CAAC,EAAE,8BAA8B,EACxC,SAAS,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO,GACrC,WAAW;IAcd,2BAA2B,CACzB,eAAe,EAAE,WAAW,EAC5B,OAAO,CAAC,EAAE,8BAA8B,EACxC,SAAS,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO,GACrC,qBAAqB;IA6BjB,iBAAiB,CACtB,eAAe,EAAE,WAAW,EAC5B,OAAO,CAAC,EAAE,8BAA8B,EACxC,SAAS,GAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAO,GACrC,kBAAkB;IAQrB,OAAO,CAAC,+BAA+B;IAIvC;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAoB3B,gBAAgB,CAAC,WAAW,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG;IAQxD,WAAW,CAAC,WAAW,EAAE,YAAY;IAQrC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;CAGrD"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const tslib_1 = require("tslib");
|
|
4
4
|
const di_1 = require("@opensumi/di");
|
|
5
5
|
const ide_core_browser_1 = require("@opensumi/ide-core-browser");
|
|
6
|
-
const ide_workspace_1 = require("@opensumi/ide-workspace");
|
|
7
6
|
const keybindings_1 = require("@opensumi/monaco-editor-core/esm/vs/base/common/keybindings");
|
|
8
7
|
const editorBrowser_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser");
|
|
9
8
|
const multiDiffEditorWidget_1 = require("@opensumi/monaco-editor-core/esm/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget");
|
|
@@ -93,12 +92,12 @@ let MonacoServiceImpl = class MonacoServiceImpl extends ide_core_browser_1.Dispo
|
|
|
93
92
|
createResourceLabel: (element) => {
|
|
94
93
|
const resourceLabel = new resource_label_1.ResourceLabel(element);
|
|
95
94
|
return {
|
|
96
|
-
setUri: (uri
|
|
95
|
+
setUri: (uri) => {
|
|
97
96
|
if (!uri) {
|
|
98
97
|
resourceLabel.clear();
|
|
99
98
|
}
|
|
100
99
|
else {
|
|
101
|
-
resourceLabel.setUri(uri
|
|
100
|
+
resourceLabel.setUri(uri);
|
|
102
101
|
}
|
|
103
102
|
},
|
|
104
103
|
dispose: () => { },
|
|
@@ -168,10 +167,6 @@ tslib_1.__decorate([
|
|
|
168
167
|
(0, di_1.Autowired)(ide_core_browser_1.KeybindingService),
|
|
169
168
|
tslib_1.__metadata("design:type", Object)
|
|
170
169
|
], MonacoServiceImpl.prototype, "keybindingService", void 0);
|
|
171
|
-
tslib_1.__decorate([
|
|
172
|
-
(0, di_1.Autowired)(ide_workspace_1.IWorkspaceService),
|
|
173
|
-
tslib_1.__metadata("design:type", Object)
|
|
174
|
-
], MonacoServiceImpl.prototype, "workspaceService", void 0);
|
|
175
170
|
tslib_1.__decorate([
|
|
176
171
|
(0, di_1.Autowired)(ide_core_browser_1.ILogger),
|
|
177
172
|
tslib_1.__metadata("design:type", Object)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"monaco.service.js","sourceRoot":"","sources":["../../src/browser/monaco.service.ts"],"names":[],"mappings":";;;AAAA,qCAA+E;AAC/E,iEAQoC;AAEpC,
|
|
1
|
+
{"version":3,"file":"monaco.service.js","sourceRoot":"","sources":["../../src/browser/monaco.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-monaco",
|
|
3
|
-
"version": "3.9.1-next-
|
|
3
|
+
"version": "3.9.1-next-1748425167.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src",
|
|
@@ -15,18 +15,18 @@
|
|
|
15
15
|
"build:worker": "../../node_modules/.bin/webpack --config webpack.config.js"
|
|
16
16
|
},
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@opensumi/ide-components": "3.9.1-next-
|
|
19
|
-
"@opensumi/ide-core-browser": "3.9.1-next-
|
|
20
|
-
"@opensumi/ide-core-common": "3.9.1-next-
|
|
21
|
-
"@opensumi/ide-overlay": "3.9.1-next-
|
|
22
|
-
"@opensumi/ide-theme": "3.9.1-next-
|
|
23
|
-
"@opensumi/ide-utils": "3.9.1-next-
|
|
18
|
+
"@opensumi/ide-components": "3.9.1-next-1748425167.0",
|
|
19
|
+
"@opensumi/ide-core-browser": "3.9.1-next-1748425167.0",
|
|
20
|
+
"@opensumi/ide-core-common": "3.9.1-next-1748425167.0",
|
|
21
|
+
"@opensumi/ide-overlay": "3.9.1-next-1748425167.0",
|
|
22
|
+
"@opensumi/ide-theme": "3.9.1-next-1748425167.0",
|
|
23
|
+
"@opensumi/ide-utils": "3.9.1-next-1748425167.0",
|
|
24
24
|
"@opensumi/monaco-editor-core": "0.54.0-patch.2"
|
|
25
25
|
},
|
|
26
26
|
"devDependencies": {
|
|
27
|
-
"@opensumi/ide-dev-tool": "3.9.1-next-
|
|
28
|
-
"@opensumi/ide-file-service": "3.9.1-next-
|
|
29
|
-
"@opensumi/ide-workspace": "3.9.1-next-
|
|
27
|
+
"@opensumi/ide-dev-tool": "3.9.1-next-1748425167.0",
|
|
28
|
+
"@opensumi/ide-file-service": "3.9.1-next-1748425167.0",
|
|
29
|
+
"@opensumi/ide-workspace": "3.9.1-next-1748425167.0"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "0e3e46b4854eff92ec24b8650e9f060ad3e5f794"
|
|
32
32
|
}
|
|
@@ -3,21 +3,3 @@
|
|
|
3
3
|
align-items: center;
|
|
4
4
|
gap: 4px;
|
|
5
5
|
}
|
|
6
|
-
|
|
7
|
-
.strikethrough {
|
|
8
|
-
text-decoration: line-through;
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
.relativePath {
|
|
12
|
-
font-size: 12px;
|
|
13
|
-
color: var(--descriptionForeground);
|
|
14
|
-
margin-left: 4px;
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
.ellipsisPath {
|
|
18
|
-
white-space: nowrap;
|
|
19
|
-
overflow: hidden;
|
|
20
|
-
text-overflow: ellipsis;
|
|
21
|
-
direction: rtl;
|
|
22
|
-
text-align: left;
|
|
23
|
-
}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { URI, Uri, getResourceIconClass } from '@opensumi/ide-core-browser';
|
|
2
|
-
import { IWorkspaceService } from '@opensumi/ide-workspace';
|
|
3
2
|
import { IResourceLabelOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory';
|
|
4
3
|
|
|
5
4
|
import styles from './resource-label.module.less';
|
|
@@ -7,25 +6,15 @@ import styles from './resource-label.module.less';
|
|
|
7
6
|
export class ResourceLabel {
|
|
8
7
|
constructor(private readonly element: HTMLElement) {}
|
|
9
8
|
|
|
10
|
-
setUri(uri: Uri,
|
|
11
|
-
this.renderFile(URI.from(uri),
|
|
9
|
+
setUri(uri: Uri, options?: IResourceLabelOptions) {
|
|
10
|
+
this.renderFile(URI.from(uri), options);
|
|
12
11
|
}
|
|
13
12
|
|
|
14
|
-
private renderFile(uri: URI,
|
|
13
|
+
private renderFile(uri: URI, options?: IResourceLabelOptions) {
|
|
15
14
|
const icon = getResourceIconClass(uri);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
: '';
|
|
20
|
-
|
|
21
|
-
const relativePathElement = pathWithoutFileName
|
|
22
|
-
? `<span class="${styles.relativePath} ${styles.ellipsisPath}">${pathWithoutFileName}</span>`
|
|
23
|
-
: '';
|
|
24
|
-
|
|
25
|
-
this.element.innerHTML = `<span class="${styles.resourceLabel}${
|
|
26
|
-
options?.strikethrough ? ` ${styles.strikethrough}` : ''
|
|
27
|
-
}"><span class="${icon.iconClass}"></span>${uri.displayName}${relativePathElement}</span>`;
|
|
28
|
-
});
|
|
15
|
+
this.element.innerHTML = `<span class="${styles.resourceLabel}${
|
|
16
|
+
options?.strikethrough ? ' strikethrough' : ''
|
|
17
|
+
}"><span class="${icon.iconClass}"></span>${uri.displayName}</span>`;
|
|
29
18
|
}
|
|
30
19
|
|
|
31
20
|
clear() {
|
|
@@ -9,7 +9,6 @@ import {
|
|
|
9
9
|
Uri,
|
|
10
10
|
} from '@opensumi/ide-core-browser';
|
|
11
11
|
import { IMergeEditorEditor } from '@opensumi/ide-core-browser/lib/monaco/merge-editor-widget';
|
|
12
|
-
import { IWorkspaceService } from '@opensumi/ide-workspace';
|
|
13
12
|
import { KeyCodeChord } from '@opensumi/monaco-editor-core/esm/vs/base/common/keybindings';
|
|
14
13
|
import { IEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/config/editorConfiguration';
|
|
15
14
|
import {
|
|
@@ -18,7 +17,6 @@ import {
|
|
|
18
17
|
isDiffEditor,
|
|
19
18
|
} from '@opensumi/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
|
|
20
19
|
import { MultiDiffEditorWidget } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/widget/multiDiffEditor/multiDiffEditorWidget';
|
|
21
|
-
import { IResourceLabelOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/browser/widget/multiDiffEditor/workbenchUIElementFactory';
|
|
22
20
|
import { ShowLightbulbIconMode } from '@opensumi/monaco-editor-core/esm/vs/editor/common/config/editorOptions';
|
|
23
21
|
import { Range } from '@opensumi/monaco-editor-core/esm/vs/editor/editor.main';
|
|
24
22
|
import { IStandaloneEditorConstructionOptions } from '@opensumi/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';
|
|
@@ -55,9 +53,6 @@ export default class MonacoServiceImpl extends Disposable implements MonacoServi
|
|
|
55
53
|
@Autowired(KeybindingService)
|
|
56
54
|
protected readonly keybindingService: KeybindingService;
|
|
57
55
|
|
|
58
|
-
@Autowired(IWorkspaceService)
|
|
59
|
-
private readonly workspaceService: IWorkspaceService;
|
|
60
|
-
|
|
61
56
|
@Autowired(ILogger)
|
|
62
57
|
private readonly logger: ILogger;
|
|
63
58
|
|
|
@@ -178,11 +173,11 @@ export default class MonacoServiceImpl extends Disposable implements MonacoServi
|
|
|
178
173
|
createResourceLabel: (element: HTMLElement) => {
|
|
179
174
|
const resourceLabel = new ResourceLabel(element);
|
|
180
175
|
return {
|
|
181
|
-
setUri: (uri: Uri
|
|
176
|
+
setUri: (uri: Uri) => {
|
|
182
177
|
if (!uri) {
|
|
183
178
|
resourceLabel.clear();
|
|
184
179
|
} else {
|
|
185
|
-
resourceLabel.setUri(uri
|
|
180
|
+
resourceLabel.setUri(uri);
|
|
186
181
|
}
|
|
187
182
|
},
|
|
188
183
|
dispose: () => {},
|