@theia/navigator 1.78.0-next.19 → 1.78.0-next.28

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.
@@ -21,7 +21,7 @@ import { MessageService } from '@theia/core/lib/common/message-service';
21
21
  import { Command } from '@theia/core/lib/common/command';
22
22
  import { DiffUris } from '@theia/core/lib/browser/diff-uris';
23
23
  import { FileService } from '@theia/filesystem/lib/browser/file-service';
24
- import { FileOperationError } from '@theia/filesystem/lib/common/files';
24
+ import { FileOperationError, FileOperationResult } from '@theia/filesystem/lib/common/files';
25
25
  export var NavigatorDiffCommands;
26
26
  (function (NavigatorDiffCommands) {
27
27
  const COMPARE_CATEGORY = 'Compare';
@@ -56,7 +56,7 @@ let NavigatorDiff = class NavigatorDiff {
56
56
  return stat.isDirectory;
57
57
  }
58
58
  catch (e) {
59
- if (e instanceof FileOperationError && e.fileOperationResult === 1 /* FileOperationResult.FILE_NOT_FOUND */) {
59
+ if (e instanceof FileOperationError && e.fileOperationResult === FileOperationResult.FILE_NOT_FOUND) {
60
60
  return true;
61
61
  }
62
62
  }
@@ -1 +1 @@
1
- {"version":3,"file":"navigator-diff.js","sourceRoot":"","sources":["../../src/browser/navigator-diff.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"navigator-diff.js","sourceRoot":"","sources":["../../src/browser/navigator-diff.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,6 @@
1
1
  import { PreferenceChangeEvent } from '@theia/core';
2
2
  import { Event, Emitter } from '@theia/core/lib/common/event';
3
+ import { SiblingClause } from '@theia/core/lib/common/glob';
3
4
  import { MaybePromise } from '@theia/core/lib/common/types';
4
5
  import { FileSystemPreferences, FileSystemConfiguration } from '@theia/filesystem/lib/common/filesystem-preferences';
5
6
  import { WorkspaceService } from '@theia/workspace/lib/browser';
@@ -24,7 +25,7 @@ export declare class FileNavigatorFilter {
24
25
  get onFilterChanged(): Event<void>;
25
26
  protected filterItem(item: {
26
27
  id: string;
27
- }): boolean;
28
+ }, hasSibling?: (name: string) => boolean): boolean;
28
29
  protected fireFilterChanged(): void;
29
30
  protected onFilesPreferenceChanged(event: PreferenceChangeEvent<FileSystemConfiguration>): void;
30
31
  protected onPreferenceChanged(event: PreferenceChangeEvent<FileNavigatorConfiguration>): void;
@@ -41,10 +42,11 @@ export declare namespace FileNavigatorFilter {
41
42
  * Returns `true` if the item should filtered our from the navigator. Otherwise, `true`.
42
43
  *
43
44
  * @param item the identifier of a tree node.
45
+ * @param hasSibling checks whether a file with the given name exists next to the item. Required to evaluate sibling clauses.
44
46
  */
45
47
  filter(item: {
46
48
  id: string;
47
- }): boolean;
49
+ }, hasSibling?: (name: string) => boolean): boolean;
48
50
  }
49
51
  namespace Predicate {
50
52
  /**
@@ -54,10 +56,11 @@ export declare namespace FileNavigatorFilter {
54
56
  function and(...predicates: Predicate[]): Predicate;
55
57
  }
56
58
  /**
57
- * Type for the exclusion patterns. The property keys are the patterns, values are whether the exclusion is enabled or not.
59
+ * Type for the exclusion patterns. The property keys are the patterns, values are whether the exclusion is enabled or not,
60
+ * or a sibling clause that enables the exclusion only if a matching sibling exists (e.g. `{ "when": "$(basename).ts" }`).
58
61
  */
59
62
  interface Exclusions {
60
- [key: string]: boolean;
63
+ [key: string]: boolean | SiblingClause;
61
64
  }
62
65
  }
63
66
  /**
@@ -68,7 +71,7 @@ export declare class FileNavigatorFilterPredicate implements FileNavigatorFilter
68
71
  constructor(exclusions: FileNavigatorFilter.Exclusions);
69
72
  filter(item: {
70
73
  id: string;
71
- }): boolean;
72
- protected createDelegate(pattern: string): FileNavigatorFilter.Predicate;
74
+ }, hasSibling?: (name: string) => boolean): boolean;
75
+ protected createDelegate(pattern: string, value?: boolean | SiblingClause): FileNavigatorFilter.Predicate;
73
76
  }
74
77
  //# sourceMappingURL=navigator-filter.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"navigator-filter.d.ts","sourceRoot":"","sources":["../../src/browser/navigator-filter.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,qDAAqD,CAAC;AACrH,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,OAAO,EAAE,wBAAwB,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAE1G;;;GAGG;AACH,qBACa,mBAAmB;IAaU,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,wBAAwB;IAZ9F,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,CAAuB;IAEhE,SAAS,CAAC,eAAe,EAAE,mBAAmB,CAAC,SAAS,CAAC;IACzD,SAAS,CAAC,eAAe,EAAE,OAAO,CAAC;IAGnC,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,qBAAqB,CAAC;IAG3D,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;gBAGG,WAAW,EAAE,wBAAwB;IAI9F,SAAS,CAAC,IAAI,IAAI,IAAI;cAIN,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAMjC,MAAM,CAAC,CAAC,SAAS;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAI9E,IAAI,eAAe,IAAI,KAAK,CAAC,IAAI,CAAC,CAEjC;IAED,SAAS,CAAC,UAAU,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO;IASnD,SAAS,CAAC,iBAAiB,IAAI,IAAI;IAInC,SAAS,CAAC,wBAAwB,CAAC,KAAK,EAAE,qBAAqB,CAAC,uBAAuB,CAAC,GAAG,IAAI;IAS/F,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,qBAAqB,CAAC,0BAA0B,CAAC,GAAG,IAAI;IAG7F,SAAS,CAAC,qBAAqB,CAAC,UAAU,EAAE,mBAAmB,CAAC,UAAU,GAAG,mBAAmB,CAAC,SAAS;IAI1G,iBAAiB,IAAI,IAAI;IAQzB,SAAS,CAAC,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,UAAU,GAAG,mBAAmB,CAAC,UAAU;CAO5G;AAED,yBAAiB,mBAAmB,CAAC;IAEjC;;OAEG;IACH,UAAiB,SAAS;QAEtB;;;;WAIG;QACH,MAAM,CAAC,IAAI,EAAE;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,GAAG,OAAO,CAAC;KAEzC;IAED,UAAiB,SAAS,CAAC;QAEvB;;;WAGG;QACH,SAAgB,GAAG,CAAC,GAAG,UAAU,EAAE,SAAS,EAAE,GAAG,SAAS,CAIzD;KAEJ;IAED;;OAEG;IACH,UAAiB,UAAU;QACvB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KAC1B;CAEJ;AAED;;GAEG;AACH,qBAAa,4BAA6B,YAAW,mBAAmB,CAAC,SAAS;IAE9E,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAgC;gBAE7C,UAAU,EAAE,mBAAmB,CAAC,UAAU;IAKtD,MAAM,CAAC,IAAI,EAAE;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO;IAIrC,SAAS,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,mBAAmB,CAAC,SAAS;CAO3E"}
1
+ {"version":3,"file":"navigator-filter.d.ts","sourceRoot":"","sources":["../../src/browser/navigator-filter.ts"],"names":[],"mappings":"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"}
@@ -14,6 +14,7 @@
14
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
15
  // *****************************************************************************
16
16
  import { __decorate, __param } from "tslib";
17
+ import { Path } from '@theia/core';
17
18
  import { Emitter } from '@theia/core/lib/common/event';
18
19
  import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
19
20
  import { FileStatNode } from '@theia/filesystem/lib/browser';
@@ -39,18 +40,26 @@ let FileNavigatorFilter = class FileNavigatorFilter {
39
40
  this.preferences.onPreferenceChanged(event => this.onPreferenceChanged(event));
40
41
  }
41
42
  async filter(items) {
42
- return (await items).filter(item => this.filterItem(item));
43
+ const resolvedItems = await items;
44
+ const siblingNames = new Set();
45
+ for (const item of resolvedItems) {
46
+ if (FileStatNode.is(item)) {
47
+ siblingNames.add(item.fileStat.name);
48
+ }
49
+ }
50
+ const hasSibling = (name) => siblingNames.has(name);
51
+ return resolvedItems.filter(item => this.filterItem(item, hasSibling));
43
52
  }
44
53
  get onFilterChanged() {
45
54
  return this.emitter.event;
46
55
  }
47
- filterItem(item) {
56
+ filterItem(item, hasSibling) {
48
57
  let relativePath;
49
58
  if (FileStatNode.is(item)) {
50
59
  const workspaceRoot = this.workspaceService.getWorkspaceRootUri(item.uri);
51
60
  relativePath = workspaceRoot?.relative(item.uri)?.toString();
52
61
  }
53
- return this.filterPredicate.filter({ id: relativePath ?? item.id });
62
+ return this.filterPredicate.filter({ id: relativePath ?? item.id }, hasSibling);
54
63
  }
55
64
  fireFilterChanged() {
56
65
  this.emitter.fire(undefined);
@@ -104,7 +113,7 @@ export { FileNavigatorFilter };
104
113
  */
105
114
  function and(...predicates) {
106
115
  return {
107
- filter: id => predicates.every(predicate => predicate.filter(id))
116
+ filter: (id, hasSibling) => predicates.every(predicate => predicate.filter(id, hasSibling))
108
117
  };
109
118
  }
110
119
  Predicate.and = and;
@@ -115,16 +124,31 @@ export { FileNavigatorFilter };
115
124
  */
116
125
  export class FileNavigatorFilterPredicate {
117
126
  constructor(exclusions) {
118
- const patterns = Object.keys(exclusions).map(pattern => ({ pattern, enabled: exclusions[pattern] })).filter(object => object.enabled).map(object => object.pattern);
119
- this.delegate = FileNavigatorFilter.Predicate.and(...patterns.map(pattern => this.createDelegate(pattern)));
127
+ const delegates = Object.keys(exclusions)
128
+ .filter(pattern => !!exclusions[pattern])
129
+ .map(pattern => this.createDelegate(pattern, exclusions[pattern]));
130
+ this.delegate = FileNavigatorFilter.Predicate.and(...delegates);
120
131
  }
121
- filter(item) {
122
- return this.delegate.filter(item);
132
+ filter(item, hasSibling) {
133
+ return this.delegate.filter(item, hasSibling);
123
134
  }
124
- createDelegate(pattern) {
135
+ createDelegate(pattern, value = true) {
125
136
  const delegate = new Minimatch(pattern);
137
+ const when = typeof value === 'object' && typeof value.when === 'string' ? value.when : undefined;
126
138
  return {
127
- filter: item => !delegate.match(item.id)
139
+ filter: (item, hasSibling) => {
140
+ if (!delegate.match(item.id)) {
141
+ return true;
142
+ }
143
+ if (when === undefined) {
144
+ return false;
145
+ }
146
+ if (typeof hasSibling !== 'function') {
147
+ return true;
148
+ }
149
+ const name = new Path(item.id).name;
150
+ return !hasSibling(when.replace('$(basename)', name));
151
+ }
128
152
  };
129
153
  }
130
154
  }
@@ -1 +1 @@
1
- {"version":3,"file":"navigator-filter.js","sourceRoot":"","sources":["../../src/browser/navigator-filter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"navigator-filter.js","sourceRoot":"","sources":["../../src/browser/navigator-filter.ts"],"names":[],"mappings":"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"}
@@ -178,6 +178,35 @@ describe('navigator-filter workspace paths', () => {
178
178
  expect(filter.testFilter(toFileStatNode(nestedDist))).to.be.true;
179
179
  });
180
180
  });
181
+ describe('navigator-filter sibling clauses', () => {
182
+ const siblings = ['foo.ts', 'foo.js', 'bar.js'];
183
+ const hasSibling = (name) => siblings.includes(name);
184
+ const predicate = new FileNavigatorFilterPredicate({ '**/*.js': { when: '$(basename).ts' } });
185
+ it('should exclude a file when the sibling exists', () => {
186
+ expect(predicate.filter({ id: 'src/foo.js' }, hasSibling)).to.be.false;
187
+ });
188
+ it('should include a file when the sibling is missing', () => {
189
+ expect(predicate.filter({ id: 'src/bar.js' }, hasSibling)).to.be.true;
190
+ });
191
+ it('should include a file when no sibling information is available', () => {
192
+ expect(predicate.filter({ id: 'src/foo.js' })).to.be.true;
193
+ });
194
+ it('should include a file that does not match the pattern', () => {
195
+ expect(predicate.filter({ id: 'src/foo.ts' }, hasSibling)).to.be.true;
196
+ });
197
+ it('should not fail when passed directly to Array.filter', () => {
198
+ const items = [{ id: 'src/foo.js' }, { id: 'src/bar.js' }];
199
+ expect(() => items.filter(predicate.filter.bind(predicate))).to.not.throw();
200
+ });
201
+ it('should resolve the siblings from the filtered items', async () => {
202
+ const workspaceService = sinon.createStubInstance(WorkspaceService);
203
+ workspaceService.getWorkspaceRootUri.returns(new URI('file:///workspace'));
204
+ const filter = new TestFileNavigatorFilter(workspaceService, predicate);
205
+ const items = ['foo.ts', 'foo.js', 'bar.js'].map(name => toFileStatNode(new URI(`file:///workspace/src/${name}`)));
206
+ const result = await filter.filter(items);
207
+ expect(result.map(item => item.fileStat.name)).to.deep.equal(['foo.ts', 'bar.js']);
208
+ });
209
+ });
181
210
  function includes(array, item, message = `Expected ${JSON.stringify(array)} to include ${JSON.stringify(item)}.`) {
182
211
  expect(array).to.deep.include(item, message);
183
212
  }
@@ -1 +1 @@
1
- {"version":3,"file":"navigator-filter.spec.js","sourceRoot":"","sources":["../../src/browser/navigator-filter.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"navigator-filter.spec.js","sourceRoot":"","sources":["../../src/browser/navigator-filter.spec.ts"],"names":[],"mappings":"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"}
@@ -19,6 +19,7 @@ import { ApplicationShell, DepthFirstTreeIterator, NavigatableWidget } from '@th
19
19
  import { FileSystemFrontendContribution } from '@theia/filesystem/lib/browser/filesystem-frontend-contribution';
20
20
  import { Emitter } from '@theia/core';
21
21
  import { FileStatNode } from '@theia/filesystem/lib/browser';
22
+ import { FileChangeType } from '@theia/filesystem/lib/common/files';
22
23
  let NavigatorDeletedEditorDecorator = class NavigatorDeletedEditorDecorator {
23
24
  constructor() {
24
25
  this.id = 'theia-deleted-editor-decorator';
@@ -30,10 +31,10 @@ let NavigatorDeletedEditorDecorator = class NavigatorDeletedEditorDecorator {
30
31
  this.fileSystemContribution.onDidChangeEditorFile(({ editor, type }) => {
31
32
  const uri = editor.getResourceUri()?.toString();
32
33
  if (uri) {
33
- if (type === 2 /* FileChangeType.DELETED */) {
34
+ if (type === FileChangeType.DELETED) {
34
35
  this.deletedURIs.add(uri);
35
36
  }
36
- else if (type === 1 /* FileChangeType.ADDED */) {
37
+ else if (type === FileChangeType.ADDED) {
37
38
  this.deletedURIs.delete(uri);
38
39
  }
39
40
  this.fireDidChangeDecorations((tree) => this.collectDecorators(tree));
@@ -1 +1 @@
1
- {"version":3,"file":"navigator-deleted-editor-decorator.js","sourceRoot":"","sources":["../../../src/browser/open-editors-widget/navigator-deleted-editor-decorator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"navigator-deleted-editor-decorator.js","sourceRoot":"","sources":["../../../src/browser/open-editors-widget/navigator-deleted-editor-decorator.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@theia/navigator",
3
- "version": "1.78.0-next.19+437666ef7",
3
+ "version": "1.78.0-next.28+abcc8ee5d",
4
4
  "description": "Theia - Navigator Extension",
5
5
  "type": "module",
6
6
  "dependencies": {
7
- "@theia/core": "1.78.0-next.19+437666ef7",
8
- "@theia/filesystem": "1.78.0-next.19+437666ef7",
9
- "@theia/workspace": "1.78.0-next.19+437666ef7",
7
+ "@theia/core": "1.78.0-next.28+abcc8ee5d",
8
+ "@theia/filesystem": "1.78.0-next.28+abcc8ee5d",
9
+ "@theia/workspace": "1.78.0-next.28+abcc8ee5d",
10
10
  "minimatch": "^10.2.6",
11
11
  "tslib": "^2.8.1"
12
12
  },
@@ -52,7 +52,7 @@
52
52
  "nyc": {
53
53
  "extends": "../../configs/nyc.json"
54
54
  },
55
- "gitHead": "437666ef7a6573ee8e5f41e3206c8be4d7e83ab4",
55
+ "gitHead": "abcc8ee5d8dc818f032b651e6b65f2e716e9fe70",
56
56
  "exports": {
57
57
  "./package.json": "./package.json",
58
58
  "./lib/browser": "./lib/browser/index.js",
@@ -207,6 +207,44 @@ describe('navigator-filter workspace paths', () => {
207
207
  });
208
208
  });
209
209
 
210
+ describe('navigator-filter sibling clauses', () => {
211
+ const siblings = ['foo.ts', 'foo.js', 'bar.js'];
212
+ const hasSibling = (name: string) => siblings.includes(name);
213
+ const predicate = new FileNavigatorFilterPredicate({ '**/*.js': { when: '$(basename).ts' } });
214
+
215
+ it('should exclude a file when the sibling exists', () => {
216
+ expect(predicate.filter({ id: 'src/foo.js' }, hasSibling)).to.be.false;
217
+ });
218
+
219
+ it('should include a file when the sibling is missing', () => {
220
+ expect(predicate.filter({ id: 'src/bar.js' }, hasSibling)).to.be.true;
221
+ });
222
+
223
+ it('should include a file when no sibling information is available', () => {
224
+ expect(predicate.filter({ id: 'src/foo.js' })).to.be.true;
225
+ });
226
+
227
+ it('should include a file that does not match the pattern', () => {
228
+ expect(predicate.filter({ id: 'src/foo.ts' }, hasSibling)).to.be.true;
229
+ });
230
+
231
+ it('should not fail when passed directly to Array.filter', () => {
232
+ const items = [{ id: 'src/foo.js' }, { id: 'src/bar.js' }];
233
+ expect(() => items.filter(predicate.filter.bind(predicate))).to.not.throw();
234
+ });
235
+
236
+ it('should resolve the siblings from the filtered items', async () => {
237
+ const workspaceService = sinon.createStubInstance(WorkspaceService);
238
+ workspaceService.getWorkspaceRootUri.returns(new URI('file:///workspace'));
239
+ const filter = new TestFileNavigatorFilter(workspaceService, predicate);
240
+ const items = ['foo.ts', 'foo.js', 'bar.js'].map(name => toFileStatNode(new URI(`file:///workspace/src/${name}`)));
241
+
242
+ const result = await filter.filter(items);
243
+
244
+ expect(result.map(item => item.fileStat.name)).to.deep.equal(['foo.ts', 'bar.js']);
245
+ });
246
+ });
247
+
210
248
  function includes<T>(array: T[], item: T, message: string = `Expected ${JSON.stringify(array)} to include ${JSON.stringify(item)}.`): void {
211
249
  expect(array).to.deep.include(item, message);
212
250
  }
@@ -14,8 +14,9 @@
14
14
  // SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
15
15
  // *****************************************************************************
16
16
 
17
- import { PreferenceChangeEvent } from '@theia/core';
17
+ import { Path, PreferenceChangeEvent } from '@theia/core';
18
18
  import { Event, Emitter } from '@theia/core/lib/common/event';
19
+ import { SiblingClause } from '@theia/core/lib/common/glob';
19
20
  import { MaybePromise } from '@theia/core/lib/common/types';
20
21
  import { inject, injectable, postConstruct } from '@theia/core/shared/inversify';
21
22
  import { FileStatNode } from '@theia/filesystem/lib/browser';
@@ -57,20 +58,28 @@ export class FileNavigatorFilter {
57
58
  }
58
59
 
59
60
  async filter<T extends { id: string }>(items: MaybePromise<T[]>): Promise<T[]> {
60
- return (await items).filter(item => this.filterItem(item));
61
+ const resolvedItems = await items;
62
+ const siblingNames = new Set<string>();
63
+ for (const item of resolvedItems) {
64
+ if (FileStatNode.is(item)) {
65
+ siblingNames.add(item.fileStat.name);
66
+ }
67
+ }
68
+ const hasSibling = (name: string) => siblingNames.has(name);
69
+ return resolvedItems.filter(item => this.filterItem(item, hasSibling));
61
70
  }
62
71
 
63
72
  get onFilterChanged(): Event<void> {
64
73
  return this.emitter.event;
65
74
  }
66
75
 
67
- protected filterItem(item: { id: string }): boolean {
76
+ protected filterItem(item: { id: string }, hasSibling?: (name: string) => boolean): boolean {
68
77
  let relativePath: string | undefined;
69
78
  if (FileStatNode.is(item)) {
70
79
  const workspaceRoot = this.workspaceService.getWorkspaceRootUri(item.uri);
71
80
  relativePath = workspaceRoot?.relative(item.uri)?.toString();
72
81
  }
73
- return this.filterPredicate.filter({ id: relativePath ?? item.id });
82
+ return this.filterPredicate.filter({ id: relativePath ?? item.id }, hasSibling);
74
83
  }
75
84
 
76
85
  protected fireFilterChanged(): void {
@@ -121,8 +130,9 @@ export namespace FileNavigatorFilter {
121
130
  * Returns `true` if the item should filtered our from the navigator. Otherwise, `true`.
122
131
  *
123
132
  * @param item the identifier of a tree node.
133
+ * @param hasSibling checks whether a file with the given name exists next to the item. Required to evaluate sibling clauses.
124
134
  */
125
- filter(item: { id: string }): boolean;
135
+ filter(item: { id: string }, hasSibling?: (name: string) => boolean): boolean;
126
136
 
127
137
  }
128
138
 
@@ -134,17 +144,18 @@ export namespace FileNavigatorFilter {
134
144
  */
135
145
  export function and(...predicates: Predicate[]): Predicate {
136
146
  return {
137
- filter: id => predicates.every(predicate => predicate.filter(id))
147
+ filter: (id, hasSibling) => predicates.every(predicate => predicate.filter(id, hasSibling))
138
148
  };
139
149
  }
140
150
 
141
151
  }
142
152
 
143
153
  /**
144
- * Type for the exclusion patterns. The property keys are the patterns, values are whether the exclusion is enabled or not.
154
+ * Type for the exclusion patterns. The property keys are the patterns, values are whether the exclusion is enabled or not,
155
+ * or a sibling clause that enables the exclusion only if a matching sibling exists (e.g. `{ "when": "$(basename).ts" }`).
145
156
  */
146
157
  export interface Exclusions {
147
- [key: string]: boolean;
158
+ [key: string]: boolean | SiblingClause;
148
159
  }
149
160
 
150
161
  }
@@ -157,18 +168,33 @@ export class FileNavigatorFilterPredicate implements FileNavigatorFilter.Predica
157
168
  private readonly delegate: FileNavigatorFilter.Predicate;
158
169
 
159
170
  constructor(exclusions: FileNavigatorFilter.Exclusions) {
160
- const patterns = Object.keys(exclusions).map(pattern => ({ pattern, enabled: exclusions[pattern] })).filter(object => object.enabled).map(object => object.pattern);
161
- this.delegate = FileNavigatorFilter.Predicate.and(...patterns.map(pattern => this.createDelegate(pattern)));
171
+ const delegates = Object.keys(exclusions)
172
+ .filter(pattern => !!exclusions[pattern])
173
+ .map(pattern => this.createDelegate(pattern, exclusions[pattern]));
174
+ this.delegate = FileNavigatorFilter.Predicate.and(...delegates);
162
175
  }
163
176
 
164
- filter(item: { id: string }): boolean {
165
- return this.delegate.filter(item);
177
+ filter(item: { id: string }, hasSibling?: (name: string) => boolean): boolean {
178
+ return this.delegate.filter(item, hasSibling);
166
179
  }
167
180
 
168
- protected createDelegate(pattern: string): FileNavigatorFilter.Predicate {
181
+ protected createDelegate(pattern: string, value: boolean | SiblingClause = true): FileNavigatorFilter.Predicate {
169
182
  const delegate = new Minimatch(pattern);
183
+ const when = typeof value === 'object' && typeof value.when === 'string' ? value.when : undefined;
170
184
  return {
171
- filter: item => !delegate.match(item.id)
185
+ filter: (item, hasSibling) => {
186
+ if (!delegate.match(item.id)) {
187
+ return true;
188
+ }
189
+ if (when === undefined) {
190
+ return false;
191
+ }
192
+ if (typeof hasSibling !== 'function') {
193
+ return true;
194
+ }
195
+ const name = new Path(item.id).name;
196
+ return !hasSibling(when.replace('$(basename)', name));
197
+ }
172
198
  };
173
199
  }
174
200