@theia/workspace 1.77.0-next.0 → 1.77.0-next.101
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/canonical-uri-service.js +12 -16
- package/lib/browser/canonical-uri-service.js.map +1 -1
- package/lib/browser/diff-service.js +23 -29
- package/lib/browser/diff-service.js.map +1 -1
- package/lib/browser/index.d.ts +8 -8
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +8 -11
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/metadata-storage/index.d.ts +2 -2
- package/lib/browser/metadata-storage/index.d.ts.map +1 -1
- package/lib/browser/metadata-storage/index.js +2 -9
- package/lib/browser/metadata-storage/index.js.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.d.ts +6 -2
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.d.ts.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.js +34 -36
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.js.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.spec.js +70 -73
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.spec.js.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-store.d.ts +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-store.d.ts.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-store.js +19 -28
- package/lib/browser/metadata-storage/workspace-metadata-store.js.map +1 -1
- package/lib/browser/quick-open-workspace.d.ts +2 -2
- package/lib/browser/quick-open-workspace.d.ts.map +1 -1
- package/lib/browser/quick-open-workspace.js +31 -40
- package/lib/browser/quick-open-workspace.js.map +1 -1
- package/lib/browser/test/with-workspace-service-defaults.d.ts +8 -0
- package/lib/browser/test/with-workspace-service-defaults.d.ts.map +1 -0
- package/lib/browser/test/with-workspace-service-defaults.js +25 -0
- package/lib/browser/test/with-workspace-service-defaults.js.map +1 -0
- package/lib/browser/untitled-workspace-exit-dialog.js +13 -17
- package/lib/browser/untitled-workspace-exit-dialog.js.map +1 -1
- package/lib/browser/workspace-breadcrumbs-contribution.d.ts +3 -1
- package/lib/browser/workspace-breadcrumbs-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-breadcrumbs-contribution.js +23 -14
- package/lib/browser/workspace-breadcrumbs-contribution.js.map +1 -1
- package/lib/browser/workspace-commands.d.ts +5 -5
- package/lib/browser/workspace-commands.d.ts.map +1 -1
- package/lib/browser/workspace-commands.js +129 -146
- package/lib/browser/workspace-commands.js.map +1 -1
- package/lib/browser/workspace-commands.spec.js +50 -52
- package/lib/browser/workspace-commands.spec.js.map +1 -1
- package/lib/browser/workspace-compare-handler.d.ts +1 -1
- package/lib/browser/workspace-compare-handler.d.ts.map +1 -1
- package/lib/browser/workspace-compare-handler.js +8 -12
- package/lib/browser/workspace-compare-handler.js.map +1 -1
- package/lib/browser/workspace-delete-handler.d.ts +2 -2
- package/lib/browser/workspace-delete-handler.d.ts.map +1 -1
- package/lib/browser/workspace-delete-handler.js +42 -51
- package/lib/browser/workspace-delete-handler.js.map +1 -1
- package/lib/browser/workspace-duplicate-handler.d.ts +2 -2
- package/lib/browser/workspace-duplicate-handler.d.ts.map +1 -1
- package/lib/browser/workspace-duplicate-handler.js +20 -27
- package/lib/browser/workspace-duplicate-handler.js.map +1 -1
- package/lib/browser/workspace-files-exclude-filter-provider.d.ts +1 -1
- package/lib/browser/workspace-files-exclude-filter-provider.d.ts.map +1 -1
- package/lib/browser/workspace-files-exclude-filter-provider.js +12 -19
- package/lib/browser/workspace-files-exclude-filter-provider.js.map +1 -1
- package/lib/browser/workspace-frontend-contribution.d.ts +4 -4
- package/lib/browser/workspace-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-frontend-contribution.js +129 -143
- package/lib/browser/workspace-frontend-contribution.js.map +1 -1
- package/lib/browser/workspace-frontend-module.js +85 -87
- package/lib/browser/workspace-frontend-module.js.map +1 -1
- package/lib/browser/workspace-input-dialog.js +13 -18
- package/lib/browser/workspace-input-dialog.js.map +1 -1
- package/lib/browser/workspace-schema-updater.d.ts +1 -1
- package/lib/browser/workspace-schema-updater.d.ts.map +1 -1
- package/lib/browser/workspace-schema-updater.js +36 -40
- package/lib/browser/workspace-schema-updater.js.map +1 -1
- package/lib/browser/workspace-search-filter-service.js +13 -20
- package/lib/browser/workspace-search-filter-service.js.map +1 -1
- package/lib/browser/workspace-search-filter-service.spec.js +18 -20
- package/lib/browser/workspace-search-filter-service.spec.js.map +1 -1
- package/lib/browser/workspace-service.d.ts +134 -5
- package/lib/browser/workspace-service.d.ts.map +1 -1
- package/lib/browser/workspace-service.js +409 -157
- package/lib/browser/workspace-service.js.map +1 -1
- package/lib/browser/workspace-service.spec.d.ts +2 -0
- package/lib/browser/workspace-service.spec.d.ts.map +1 -0
- package/lib/browser/workspace-service.spec.js +425 -0
- package/lib/browser/workspace-service.spec.js.map +1 -0
- package/lib/browser/workspace-storage-service.d.ts +1 -1
- package/lib/browser/workspace-storage-service.d.ts.map +1 -1
- package/lib/browser/workspace-storage-service.js +13 -21
- package/lib/browser/workspace-storage-service.js.map +1 -1
- package/lib/browser/workspace-trust-dialog.js +9 -13
- package/lib/browser/workspace-trust-dialog.js.map +1 -1
- package/lib/browser/workspace-trust-service.d.ts +3 -3
- package/lib/browser/workspace-trust-service.d.ts.map +1 -1
- package/lib/browser/workspace-trust-service.js +106 -127
- package/lib/browser/workspace-trust-service.js.map +1 -1
- package/lib/browser/workspace-trust-service.spec.js +146 -148
- package/lib/browser/workspace-trust-service.spec.js.map +1 -1
- package/lib/browser/workspace-uri-contribution.d.ts +27 -2
- package/lib/browser/workspace-uri-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-uri-contribution.js +79 -32
- package/lib/browser/workspace-uri-contribution.js.map +1 -1
- package/lib/browser/workspace-uri-contribution.spec.js +130 -70
- package/lib/browser/workspace-uri-contribution.spec.js.map +1 -1
- package/lib/browser/workspace-user-working-directory-provider.d.ts +1 -1
- package/lib/browser/workspace-user-working-directory-provider.d.ts.map +1 -1
- package/lib/browser/workspace-user-working-directory-provider.js +13 -18
- package/lib/browser/workspace-user-working-directory-provider.js.map +1 -1
- package/lib/browser/workspace-utils.d.ts +1 -1
- package/lib/browser/workspace-utils.d.ts.map +1 -1
- package/lib/browser/workspace-utils.js +8 -12
- package/lib/browser/workspace-utils.js.map +1 -1
- package/lib/browser/workspace-variable-contribution.d.ts +1 -1
- package/lib/browser/workspace-variable-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-variable-contribution.js +37 -47
- package/lib/browser/workspace-variable-contribution.js.map +1 -1
- package/lib/browser/workspace-window-title-updater.d.ts +1 -1
- package/lib/browser/workspace-window-title-updater.d.ts.map +1 -1
- package/lib/browser/workspace-window-title-updater.js +12 -16
- package/lib/browser/workspace-window-title-updater.js.map +1 -1
- package/lib/browser-only/browser-only-workspace-server.d.ts +1 -1
- package/lib/browser-only/browser-only-workspace-server.d.ts.map +1 -1
- package/lib/browser-only/browser-only-workspace-server.js +17 -22
- package/lib/browser-only/browser-only-workspace-server.js.map +1 -1
- package/lib/browser-only/workspace-frontend-only-module.js +8 -10
- package/lib/browser-only/workspace-frontend-only-module.js.map +1 -1
- package/lib/common/index.d.ts +4 -4
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +4 -7
- package/lib/common/index.js.map +1 -1
- package/lib/common/test/mock-workspace-server.d.ts +1 -1
- package/lib/common/test/mock-workspace-server.d.ts.map +1 -1
- package/lib/common/test/mock-workspace-server.js +5 -8
- package/lib/common/test/mock-workspace-server.js.map +1 -1
- package/lib/common/untitled-workspace-service.d.ts +1 -1
- package/lib/common/untitled-workspace-service.d.ts.map +1 -1
- package/lib/common/untitled-workspace-service.js +8 -12
- package/lib/common/untitled-workspace-service.js.map +1 -1
- package/lib/common/workspace-file-service.js +11 -14
- package/lib/common/workspace-file-service.js.map +1 -1
- package/lib/common/workspace-preferences.js +14 -19
- package/lib/common/workspace-preferences.js.map +1 -1
- package/lib/common/workspace-protocol.js +2 -5
- package/lib/common/workspace-protocol.js.map +1 -1
- package/lib/common/workspace-trust-preferences.js +29 -34
- package/lib/common/workspace-trust-preferences.js.map +1 -1
- package/lib/electron-browser/electron-workspace-contribution.d.ts +1 -1
- package/lib/electron-browser/electron-workspace-contribution.d.ts.map +1 -1
- package/lib/electron-browser/electron-workspace-contribution.js +11 -15
- package/lib/electron-browser/electron-workspace-contribution.js.map +1 -1
- package/lib/electron-browser/electron-workspace-module.js +6 -8
- package/lib/electron-browser/electron-workspace-module.js.map +1 -1
- package/lib/node/default-workspace-server.d.ts +1 -1
- package/lib/node/default-workspace-server.d.ts.map +1 -1
- package/lib/node/default-workspace-server.js +51 -63
- package/lib/node/default-workspace-server.js.map +1 -1
- package/lib/node/default-workspace-server.spec.js +29 -31
- package/lib/node/default-workspace-server.spec.js.map +1 -1
- package/lib/node/index.d.ts +2 -2
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +2 -5
- package/lib/node/index.js.map +1 -1
- package/lib/node/workspace-backend-module.js +21 -23
- package/lib/node/workspace-backend-module.js.map +1 -1
- package/package.json +17 -5
- package/src/browser/index.ts +8 -8
- package/src/browser/metadata-storage/index.ts +2 -2
- package/src/browser/metadata-storage/workspace-metadata-storage-service.spec.ts +4 -5
- package/src/browser/metadata-storage/workspace-metadata-storage-service.ts +10 -3
- package/src/browser/metadata-storage/workspace-metadata-store.ts +1 -1
- package/src/browser/quick-open-workspace.ts +2 -2
- package/src/browser/test/with-workspace-service-defaults.ts +26 -0
- package/src/browser/workspace-breadcrumbs-contribution.ts +16 -1
- package/src/browser/workspace-commands.spec.ts +6 -6
- package/src/browser/workspace-commands.ts +7 -8
- package/src/browser/workspace-compare-handler.ts +1 -1
- package/src/browser/workspace-delete-handler.ts +2 -2
- package/src/browser/workspace-duplicate-handler.ts +2 -2
- package/src/browser/workspace-files-exclude-filter-provider.ts +1 -1
- package/src/browser/workspace-frontend-contribution.ts +10 -8
- package/src/browser/workspace-frontend-module.ts +25 -25
- package/src/browser/workspace-schema-updater.ts +5 -1
- package/src/browser/workspace-search-filter-service.spec.ts +1 -1
- package/src/browser/workspace-service.spec.ts +508 -0
- package/src/browser/workspace-service.ts +353 -44
- package/src/browser/workspace-storage-service.ts +1 -1
- package/src/browser/workspace-trust-service.spec.ts +2 -2
- package/src/browser/workspace-trust-service.ts +5 -5
- package/src/browser/workspace-uri-contribution.spec.ts +76 -6
- package/src/browser/workspace-uri-contribution.ts +61 -4
- package/src/browser/workspace-user-working-directory-provider.ts +1 -1
- package/src/browser/workspace-utils.ts +1 -1
- package/src/browser/workspace-variable-contribution.ts +1 -1
- package/src/browser/workspace-window-title-updater.ts +1 -1
- package/src/browser-only/browser-only-workspace-server.ts +1 -1
- package/src/browser-only/workspace-frontend-only-module.ts +2 -2
- package/src/common/index.ts +4 -4
- package/src/common/test/mock-workspace-server.ts +1 -1
- package/src/common/untitled-workspace-service.ts +1 -1
- package/src/electron-browser/electron-workspace-contribution.ts +1 -1
- package/src/electron-browser/electron-workspace-module.ts +1 -1
- package/src/node/default-workspace-server.spec.ts +2 -2
- package/src/node/default-workspace-server.ts +1 -1
- package/src/node/index.ts +2 -2
- package/src/node/workspace-backend-module.ts +3 -3
- package/src/typings/valid-filename.d.ts +20 -0
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource and others.
|
|
4
3
|
//
|
|
@@ -14,19 +13,17 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
const
|
|
21
|
-
const inversify_1 = require("@theia/core/shared/inversify");
|
|
22
|
-
exports.WorkspaceSearchFilterProvider = Symbol('WorkspaceSearchFilterProvider');
|
|
16
|
+
import { __decorate } from "tslib";
|
|
17
|
+
import { ContributionProvider, Emitter } from '@theia/core';
|
|
18
|
+
import { inject, injectable, named, postConstruct } from '@theia/core/shared/inversify';
|
|
19
|
+
export const WorkspaceSearchFilterProvider = Symbol('WorkspaceSearchFilterProvider');
|
|
23
20
|
/**
|
|
24
21
|
* A service providing workspace search filters to clients performing searches over files in the
|
|
25
22
|
* workspace. Clients may use these filters in whatever way makes most sense for them.
|
|
26
23
|
*/
|
|
27
24
|
let WorkspaceSearchFilterService = class WorkspaceSearchFilterService {
|
|
28
25
|
constructor() {
|
|
29
|
-
this.onExclusionGlobsChangedEmitter = new
|
|
26
|
+
this.onExclusionGlobsChangedEmitter = new Emitter();
|
|
30
27
|
/** An event signalling when the exclusion globs provided by this provider have changed. */
|
|
31
28
|
this.onExclusionGlobsChanged = this.onExclusionGlobsChangedEmitter.event;
|
|
32
29
|
}
|
|
@@ -54,19 +51,15 @@ let WorkspaceSearchFilterService = class WorkspaceSearchFilterService {
|
|
|
54
51
|
return this.exclusionGlobs;
|
|
55
52
|
}
|
|
56
53
|
};
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
(
|
|
60
|
-
(0, inversify_1.named)(exports.WorkspaceSearchFilterProvider),
|
|
61
|
-
tslib_1.__metadata("design:type", Object)
|
|
54
|
+
__decorate([
|
|
55
|
+
inject(ContributionProvider),
|
|
56
|
+
named(WorkspaceSearchFilterProvider)
|
|
62
57
|
], WorkspaceSearchFilterService.prototype, "providers", void 0);
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
tslib_1.__metadata("design:type", Function),
|
|
66
|
-
tslib_1.__metadata("design:paramtypes", []),
|
|
67
|
-
tslib_1.__metadata("design:returntype", void 0)
|
|
58
|
+
__decorate([
|
|
59
|
+
postConstruct()
|
|
68
60
|
], WorkspaceSearchFilterService.prototype, "init", null);
|
|
69
|
-
|
|
70
|
-
|
|
61
|
+
WorkspaceSearchFilterService = __decorate([
|
|
62
|
+
injectable()
|
|
71
63
|
], WorkspaceSearchFilterService);
|
|
64
|
+
export { WorkspaceSearchFilterService };
|
|
72
65
|
//# sourceMappingURL=workspace-search-filter-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-search-filter-service.js","sourceRoot":"","sources":["../../src/browser/workspace-search-filter-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workspace-search-filter-service.js","sourceRoot":"","sources":["../../src/browser/workspace-search-filter-service.ts"],"names":[],"mappings":"AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,OAAO,EAAE,oBAAoB,EAAE,OAAO,EAAS,MAAM,aAAa,CAAC;AACnE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAExF,MAAM,CAAC,MAAM,6BAA6B,GAAG,MAAM,CAAC,+BAA+B,CAAC,CAAC;AAarF;;;GAGG;AAEI,IAAM,4BAA4B,GAAlC,MAAM,4BAA4B;IAAlC;QAKgB,mCAA8B,GAAG,IAAI,OAAO,EAAQ,CAAC;QACxE,2FAA2F;QAClF,4BAAuB,GAAgB,IAAI,CAAC,8BAA8B,CAAC,KAAK,CAAC;IA6B9F,CAAC;IAxBa,IAAI;QACV,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,EAAE,CAAC;YACvD,QAAQ,CAAC,uBAAuB,CAAC,GAAG,EAAE;gBAClC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC;gBAChC,IAAI,CAAC,8BAA8B,CAAC,IAAI,EAAE,CAAC;YAC/C,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED;;OAEG;IACH,iBAAiB;QACb,IAAI,IAAI,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACpC,MAAM,KAAK,GAAG,IAAI,GAAG,EAAU,CAAC;YAChC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE,EAAE,CAAC;gBACvD,KAAK,MAAM,IAAI,IAAI,QAAQ,CAAC,iBAAiB,EAAE,EAAE,CAAC;oBAC9C,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;YACL,CAAC;YACD,IAAI,CAAC,cAAc,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC;IAC/B,CAAC;CACJ,CAAA;AAjCsB;IADlB,MAAM,CAAC,oBAAoB,CAAC;IAAE,KAAK,CAAC,6BAA6B,CAAC;+DACe;AASxE;IADT,aAAa,EAAE;wDAQf;AAnBQ,4BAA4B;IADxC,UAAU,EAAE;GACA,4BAA4B,CAoCxC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource and others.
|
|
4
3
|
//
|
|
@@ -14,15 +13,14 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
const workspace_search_filter_service_1 = require("./workspace-search-filter-service");
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import * as sinon from 'sinon';
|
|
18
|
+
import { Emitter } from '@theia/core';
|
|
19
|
+
import { WorkspaceSearchFilterService } from './workspace-search-filter-service.js';
|
|
22
20
|
class MockProvider {
|
|
23
21
|
constructor(globs = []) {
|
|
24
22
|
this.globs = globs;
|
|
25
|
-
this.onExclusionGlobsChangedEmitter = new
|
|
23
|
+
this.onExclusionGlobsChangedEmitter = new Emitter();
|
|
26
24
|
this.onExclusionGlobsChanged = this.onExclusionGlobsChangedEmitter.event;
|
|
27
25
|
}
|
|
28
26
|
getExclusionGlobs() {
|
|
@@ -34,7 +32,7 @@ class MockProvider {
|
|
|
34
32
|
}
|
|
35
33
|
}
|
|
36
34
|
function createService(providers) {
|
|
37
|
-
const service = new
|
|
35
|
+
const service = new WorkspaceSearchFilterService();
|
|
38
36
|
const contributionProvider = {
|
|
39
37
|
getContributions: () => providers
|
|
40
38
|
};
|
|
@@ -49,33 +47,33 @@ describe('WorkspaceSearchFilterService', () => {
|
|
|
49
47
|
describe('getExclusionGlobs', () => {
|
|
50
48
|
it('should return empty array when no providers are registered', () => {
|
|
51
49
|
const service = createService([]);
|
|
52
|
-
|
|
50
|
+
expect(service.getExclusionGlobs()).to.deep.equal([]);
|
|
53
51
|
});
|
|
54
52
|
it('should return globs from a single provider', () => {
|
|
55
53
|
const provider = new MockProvider(['**/*.log', '**/node_modules']);
|
|
56
54
|
const service = createService([provider]);
|
|
57
|
-
|
|
55
|
+
expect(service.getExclusionGlobs()).to.deep.equal(['**/*.log', '**/node_modules']);
|
|
58
56
|
});
|
|
59
57
|
it('should aggregate globs from multiple providers', () => {
|
|
60
58
|
const providerA = new MockProvider(['**/*.log']);
|
|
61
59
|
const providerB = new MockProvider(['**/node_modules']);
|
|
62
60
|
const service = createService([providerA, providerB]);
|
|
63
|
-
|
|
64
|
-
|
|
61
|
+
expect(service.getExclusionGlobs()).to.include.members(['**/*.log', '**/node_modules']);
|
|
62
|
+
expect(service.getExclusionGlobs()).to.have.lengthOf(2);
|
|
65
63
|
});
|
|
66
64
|
it('should deduplicate globs across providers', () => {
|
|
67
65
|
const providerA = new MockProvider(['**/*.log', '**/dist']);
|
|
68
66
|
const providerB = new MockProvider(['**/*.log', '**/node_modules']);
|
|
69
67
|
const service = createService([providerA, providerB]);
|
|
70
68
|
const globs = service.getExclusionGlobs();
|
|
71
|
-
|
|
72
|
-
|
|
69
|
+
expect(globs).to.have.lengthOf(3);
|
|
70
|
+
expect(globs).to.include.members(['**/*.log', '**/dist', '**/node_modules']);
|
|
73
71
|
});
|
|
74
72
|
it('should handle providers that return empty arrays', () => {
|
|
75
73
|
const providerA = new MockProvider([]);
|
|
76
74
|
const providerB = new MockProvider(['**/*.log']);
|
|
77
75
|
const service = createService([providerA, providerB]);
|
|
78
|
-
|
|
76
|
+
expect(service.getExclusionGlobs()).to.deep.equal(['**/*.log']);
|
|
79
77
|
});
|
|
80
78
|
});
|
|
81
79
|
describe('onExclusionGlobsChanged', () => {
|
|
@@ -85,7 +83,7 @@ describe('WorkspaceSearchFilterService', () => {
|
|
|
85
83
|
const spy = sinon.spy();
|
|
86
84
|
service.onExclusionGlobsChanged(spy);
|
|
87
85
|
provider.setGlobs(['**/dist']);
|
|
88
|
-
|
|
86
|
+
expect(spy.calledOnce).to.be.true;
|
|
89
87
|
});
|
|
90
88
|
it('should fire once per provider change event', () => {
|
|
91
89
|
const providerA = new MockProvider(['**/*.log']);
|
|
@@ -95,14 +93,14 @@ describe('WorkspaceSearchFilterService', () => {
|
|
|
95
93
|
service.onExclusionGlobsChanged(spy);
|
|
96
94
|
providerA.setGlobs(['**/dist']);
|
|
97
95
|
providerB.setGlobs(['**/build']);
|
|
98
|
-
|
|
96
|
+
expect(spy.calledTwice).to.be.true;
|
|
99
97
|
});
|
|
100
98
|
it('should not fire when no provider changes', () => {
|
|
101
99
|
const provider = new MockProvider(['**/*.log']);
|
|
102
100
|
const service = createService([provider]);
|
|
103
101
|
const spy = sinon.spy();
|
|
104
102
|
service.onExclusionGlobsChanged(spy);
|
|
105
|
-
|
|
103
|
+
expect(spy.called).to.be.false;
|
|
106
104
|
});
|
|
107
105
|
it('should recalculate when any provider fires a change event', () => {
|
|
108
106
|
const providerA = new MockProvider(['**/*.log']);
|
|
@@ -111,8 +109,8 @@ describe('WorkspaceSearchFilterService', () => {
|
|
|
111
109
|
service.getExclusionGlobs();
|
|
112
110
|
providerB.setGlobs(['**/build']);
|
|
113
111
|
const globs = service.getExclusionGlobs();
|
|
114
|
-
|
|
115
|
-
|
|
112
|
+
expect(globs).to.include.members(['**/*.log', '**/build']);
|
|
113
|
+
expect(globs).to.not.include('**/node_modules');
|
|
116
114
|
});
|
|
117
115
|
});
|
|
118
116
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-search-filter-service.spec.js","sourceRoot":"","sources":["../../src/browser/workspace-search-filter-service.spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workspace-search-filter-service.spec.js","sourceRoot":"","sources":["../../src/browser/workspace-search-filter-service.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import URI from '@theia/core/lib/common/uri';
|
|
2
|
-
import { WorkspaceServer, UntitledWorkspaceService, WorkspaceFileService } from '../common';
|
|
2
|
+
import { WorkspaceServer, UntitledWorkspaceService, WorkspaceFileService } from '../common/index.js';
|
|
3
3
|
import { WindowService } from '@theia/core/lib/browser/window/window-service';
|
|
4
4
|
import { FrontendApplicationContribution, LabelProvider, OnWillStopAction } from '@theia/core/lib/browser';
|
|
5
5
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
6
6
|
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
|
|
7
7
|
import { ILogger, Disposable, DisposableCollection, Emitter, Event, MaybePromise, MessageService, ContributionProvider } from '@theia/core';
|
|
8
|
-
import { WorkspacePreferences } from '../common/workspace-preferences';
|
|
8
|
+
import { WorkspacePreferences } from '../common/workspace-preferences.js';
|
|
9
9
|
import { FileStat, BaseStat } from '@theia/filesystem/lib/common/files';
|
|
10
10
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
11
11
|
import { WindowTitleService } from '@theia/core/lib/browser/window/window-title-service';
|
|
12
12
|
import { FileSystemPreferences } from '@theia/filesystem/lib/common';
|
|
13
|
-
import { WorkspaceSchemaUpdater } from './workspace-schema-updater';
|
|
13
|
+
import { WorkspaceSchemaUpdater } from './workspace-schema-updater.js';
|
|
14
14
|
import { IJSONSchema } from '@theia/core/lib/common/json-schema';
|
|
15
15
|
import { PreferenceSchemaService, PreferenceService } from '@theia/core/lib/common/preferences';
|
|
16
16
|
export declare const WorkspaceOpenHandlerContribution: unique symbol;
|
|
@@ -29,6 +29,10 @@ export interface WorkspaceHandlingContribution {
|
|
|
29
29
|
export declare class WorkspaceService implements FrontendApplicationContribution, WorkspaceOpenHandlerContribution {
|
|
30
30
|
protected _workspace: FileStat | undefined;
|
|
31
31
|
protected _roots: FileStat[];
|
|
32
|
+
/** The names of the roots, published together with `_roots` when `onWorkspaceChanged` fires. */
|
|
33
|
+
protected configuredRootNames: Map<string, string>;
|
|
34
|
+
/** The names of the roots read by the last `computeRoots`, not yet published. */
|
|
35
|
+
protected computedRootNames: Map<string, string>;
|
|
32
36
|
protected deferredRoots: Deferred<FileStat[]>;
|
|
33
37
|
protected readonly fileService: FileService;
|
|
34
38
|
protected readonly server: WorkspaceServer;
|
|
@@ -79,7 +83,13 @@ export declare class WorkspaceService implements FrontendApplicationContribution
|
|
|
79
83
|
protected setWorkspace(workspaceStat: FileStat | undefined): Promise<void>;
|
|
80
84
|
protected updateWorkspace(): Promise<void>;
|
|
81
85
|
protected updateRoots(): Promise<void>;
|
|
86
|
+
/**
|
|
87
|
+
* Computes the workspace roots. Also sets `computedRootNames` to the names given to the roots in the workspace file,
|
|
88
|
+
* which `updateRoots` publishes with the roots, see `getConfiguredRootName`.
|
|
89
|
+
* An override that does not call `super` has to set `computedRootNames` itself, otherwise the names of the previous roots remain.
|
|
90
|
+
*/
|
|
82
91
|
protected computeRoots(): Promise<FileStat[]>;
|
|
92
|
+
protected areConfiguredRootNamesEqual(names: Map<string, string>, otherNames: Map<string, string>): boolean;
|
|
83
93
|
protected getWorkspaceDataFromFile(): Promise<WorkspaceData | undefined>;
|
|
84
94
|
protected updateTitle(): void;
|
|
85
95
|
/**
|
|
@@ -132,7 +142,12 @@ export declare class WorkspaceService implements FrontendApplicationContribution
|
|
|
132
142
|
* Removes root folder(s) from workspace.
|
|
133
143
|
*/
|
|
134
144
|
removeRoots(uris: URI[]): Promise<void>;
|
|
135
|
-
|
|
145
|
+
/**
|
|
146
|
+
* Removes `deleteCount` roots starting at `start` and inserts the given roots there, and writes the result to the workspace file.
|
|
147
|
+
* A root to add can be given a name, which is written to the workspace file as the `name` of its folder entry.
|
|
148
|
+
* @returns the URIs of the removed roots
|
|
149
|
+
*/
|
|
150
|
+
spliceRoots(start: number, deleteCount?: number, ...rootsToAdd: (URI | WorkspaceRootToAdd)[]): Promise<URI[]>;
|
|
136
151
|
getUntitledWorkspace(): Promise<URI>;
|
|
137
152
|
protected writeWorkspaceFile(workspaceFile: FileStat | undefined, workspaceData: WorkspaceData): Promise<FileStat | undefined>;
|
|
138
153
|
/**
|
|
@@ -179,6 +194,22 @@ export declare class WorkspaceService implements FrontendApplicationContribution
|
|
|
179
194
|
* @param uri URI of the file
|
|
180
195
|
*/
|
|
181
196
|
getWorkspaceRootUri(uri: URI | undefined): URI | undefined;
|
|
197
|
+
/**
|
|
198
|
+
* Returns the name given to the workspace root by the `name` property of its folder entry in the workspace file.
|
|
199
|
+
* This is the name shown for the root, as `WorkspaceFolder.name` in VS Code. Unlike the unique names of {@link getRootNames},
|
|
200
|
+
* it is chosen by the user and not used to address files.
|
|
201
|
+
* @param rootUri URI of the workspace root
|
|
202
|
+
* @returns the name of the root, or `undefined` if the root has no name or is not a workspace root
|
|
203
|
+
*/
|
|
204
|
+
getConfiguredRootName(rootUri: URI): string | undefined;
|
|
205
|
+
/**
|
|
206
|
+
* The configured root names by the string of a root URI as passed to `getConfiguredRootName`,
|
|
207
|
+
* for the `configuredRootNames` they were looked up in.
|
|
208
|
+
*/
|
|
209
|
+
protected configuredRootNamesByUri: {
|
|
210
|
+
names: Map<string, string>;
|
|
211
|
+
byUri: Map<string, string | undefined>;
|
|
212
|
+
} | undefined;
|
|
182
213
|
/**
|
|
183
214
|
* Returns the relative path of the given file to the workspace root.
|
|
184
215
|
* @param uri URI of the file
|
|
@@ -198,6 +229,91 @@ export declare class WorkspaceService implements FrontendApplicationContribution
|
|
|
198
229
|
* @param uri URI of the file
|
|
199
230
|
*/
|
|
200
231
|
getRootPrefixedPath(uri: URI): string;
|
|
232
|
+
/**
|
|
233
|
+
* Returns a unique name for each workspace root, in workspace order.
|
|
234
|
+
*
|
|
235
|
+
* A root is named after its directory basename, e.g. `backend`. Roots that share a basename are
|
|
236
|
+
* treated as peers: each of them is named after the shortest tail of its path that tells them
|
|
237
|
+
* apart, e.g. `alice/app` and `bob/app`. A name that another name starts with, e.g. `alice` next to
|
|
238
|
+
* `alice/app`, is qualified in the same way, e.g. `work/alice`, so that every path resolves to the root
|
|
239
|
+
* it came from. The names are thus always the ending of the real path, so they match what appears in
|
|
240
|
+
* terminal output, compiler errors and the like.
|
|
241
|
+
*
|
|
242
|
+
* These are the root names used by {@link getRootPrefixedPath} and resolved by {@link resolveRootPrefixedPath}.
|
|
243
|
+
*/
|
|
244
|
+
getRootNames(): ReadonlyMap<string, URI>;
|
|
245
|
+
/**
|
|
246
|
+
* The root names, and the names by root URI, which depend on each other. Reset whenever the roots change.
|
|
247
|
+
*/
|
|
248
|
+
protected rootNamesCache: {
|
|
249
|
+
names: ReadonlyMap<string, URI>;
|
|
250
|
+
namesByRoot: ReadonlyMap<string, string>;
|
|
251
|
+
} | undefined;
|
|
252
|
+
protected getRootNamesCache(): {
|
|
253
|
+
names: ReadonlyMap<string, URI>;
|
|
254
|
+
namesByRoot: ReadonlyMap<string, string>;
|
|
255
|
+
};
|
|
256
|
+
protected computeRootNames(workspaceRoots: FileStat[]): Map<string, URI>;
|
|
257
|
+
/**
|
|
258
|
+
* Returns the name of the given workspace root, as assigned by {@link getRootNames}, or
|
|
259
|
+
* `undefined` if the URI is not a workspace root.
|
|
260
|
+
*/
|
|
261
|
+
getRootName(rootUri: URI): string | undefined;
|
|
262
|
+
/**
|
|
263
|
+
* Resolves a path in the format of {@link getRootPrefixedPath}, i.e. `<rootName>/<relativePath>`
|
|
264
|
+
* or a bare `<rootName>`, to a URI. If more than one root name is a prefix of the path, which is
|
|
265
|
+
* the case when a root named `a` has a subfolder `b` and another root is named `a/b`, the longest
|
|
266
|
+
* one wins.
|
|
267
|
+
*
|
|
268
|
+
* @returns `undefined` if the path is absolute, does not start with a root name or leaves its root.
|
|
269
|
+
*/
|
|
270
|
+
resolveRootPrefixedPath(rootPrefixedPath: string): URI | undefined;
|
|
271
|
+
/**
|
|
272
|
+
* Resolves a path that contains the basename of a workspace root, preceded by nothing or by the
|
|
273
|
+
* trailing segments of the root's parent path, e.g. `bob/app/src` for the root `/home/bob/app`.
|
|
274
|
+
* Unlike {@link resolveRootPrefixedPath}, this does not depend on the current root names, so it
|
|
275
|
+
* also resolves paths that were prefixed with a root name before the workspace roots changed.
|
|
276
|
+
*
|
|
277
|
+
* @returns the distinct candidates in workspace order, which are several if the path is ambiguous,
|
|
278
|
+
* or none if the path is absolute, leaves its root or does not contain the basename of a root.
|
|
279
|
+
*/
|
|
280
|
+
resolveSupraRelativePath(supraRelativePath: string): URI[];
|
|
281
|
+
/**
|
|
282
|
+
* Resolves `segments` against the given root as described in {@link resolveSupraRelativePath}.
|
|
283
|
+
*/
|
|
284
|
+
protected resolveSupraRelativeSegments(rootUri: URI, segments: string[]): URI | undefined;
|
|
285
|
+
/**
|
|
286
|
+
* Splits a `/`-separated path that starts with a root name, as in {@link getRootPrefixedPath}, into
|
|
287
|
+
* that root and the rest of the path, which is empty for a bare root name. The rest is not normalized,
|
|
288
|
+
* so it may as well be a glob. If more than one root name is a prefix of the path, the longest one wins.
|
|
289
|
+
*
|
|
290
|
+
* @returns `undefined` if the path does not start with a root name.
|
|
291
|
+
*/
|
|
292
|
+
splitRootPrefixedPath(rootPrefixedPath: string): {
|
|
293
|
+
rootName: string;
|
|
294
|
+
rootUri: URI;
|
|
295
|
+
rest: string;
|
|
296
|
+
} | undefined;
|
|
297
|
+
/**
|
|
298
|
+
* Computes the name of a root from the roots that share its basename (including itself).
|
|
299
|
+
*/
|
|
300
|
+
protected computeRootName(root: URI, peers: URI[]): string;
|
|
301
|
+
/**
|
|
302
|
+
* Qualifies a root name that another root name starts with, e.g. `alice` next to `alice/app`, by more
|
|
303
|
+
* segments of its path, as a path in the one root would otherwise resolve to the other. If the root
|
|
304
|
+
* named `alice/app` is the `app` folder of the root named `alice`, the names are left as they are:
|
|
305
|
+
* the nested root is then also the one that {@link getRootPrefixedPath} names its files after.
|
|
306
|
+
*/
|
|
307
|
+
protected qualifyRootNames(names: Map<string, URI>): Map<string, URI>;
|
|
308
|
+
/**
|
|
309
|
+
* Adds the next parent segment to the name of a root, unless the name is its whole path or its URI already.
|
|
310
|
+
*
|
|
311
|
+
* @returns whether the name was qualified
|
|
312
|
+
*/
|
|
313
|
+
protected qualifyRootName(entry: {
|
|
314
|
+
name: string;
|
|
315
|
+
root: URI;
|
|
316
|
+
}): boolean;
|
|
201
317
|
areWorkspaceRoots(uris: URI[]): boolean;
|
|
202
318
|
/**
|
|
203
319
|
* Check if the file should be considered as a workspace file.
|
|
@@ -220,6 +336,11 @@ export interface WorkspaceInput {
|
|
|
220
336
|
*/
|
|
221
337
|
preserveWindow?: boolean;
|
|
222
338
|
}
|
|
339
|
+
export interface WorkspaceRootToAdd {
|
|
340
|
+
uri: URI;
|
|
341
|
+
/** The name of the root, written to the workspace file as the `name` of its folder entry. */
|
|
342
|
+
name?: string;
|
|
343
|
+
}
|
|
223
344
|
export interface WorkspaceData {
|
|
224
345
|
folders: Array<{
|
|
225
346
|
path: string;
|
|
@@ -231,7 +352,15 @@ export interface WorkspaceData {
|
|
|
231
352
|
}
|
|
232
353
|
export declare namespace WorkspaceData {
|
|
233
354
|
function is(data: unknown): data is WorkspaceData;
|
|
234
|
-
|
|
355
|
+
/**
|
|
356
|
+
* Normalizes the given folder URI the same way as the URIs of the workspace roots, so that they can be compared.
|
|
357
|
+
*/
|
|
358
|
+
function normalizeFolderUri(folderUri: string): string;
|
|
359
|
+
/**
|
|
360
|
+
* Builds the workspace data for the given folders. A folder given as an entry with a `name` keeps that name,
|
|
361
|
+
* any other folder keeps the `name` of its entry in `additionalFields.folders`. Names that are not strings are dropped.
|
|
362
|
+
*/
|
|
363
|
+
function buildWorkspaceData(folders: string[] | FileStat[] | WorkspaceData['folders'], additionalFields?: Partial<WorkspaceData>): WorkspaceData;
|
|
235
364
|
function transformToRelative(data: WorkspaceData, workspaceFile?: FileStat): WorkspaceData;
|
|
236
365
|
function transformToAbsolute(data: WorkspaceData, workspaceFile?: BaseStat): WorkspaceData;
|
|
237
366
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-service.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-service.ts"],"names":[],"mappings":"AAiBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-service.d.ts","sourceRoot":"","sources":["../../src/browser/workspace-service.ts"],"names":[],"mappings":"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"}
|