Skip to content

Commit 2ee927d

Browse files
committed
updated multi-root support with a more native impl
1 parent be4c6d4 commit 2ee927d

File tree

4 files changed

+5
-88
lines changed

4 files changed

+5
-88
lines changed

package.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,11 +232,6 @@
232232
{
233233
"id": "bazelTaskOutline",
234234
"name": "Bazel Run Targets"
235-
},
236-
{
237-
"id": "rootFileViewer",
238-
"name": "Project Root (Files)",
239-
"when": "isMultiRoot"
240235
}
241236
]
242237
},

src/extension.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import { registerLSClient } from './loggingTCPServer';
2121
import { ProjectViewManager } from './projectViewManager';
2222
import { BazelRunTargetProvider } from './provider/bazelRunTargetProvider';
2323
import { BazelTaskProvider } from './provider/bazelTaskProvider';
24-
import { RootFileViewProvider } from './provider/rootFileViewProvider';
2524
import {
2625
getWorkspaceRoot,
2726
initBazelProjectFile,
@@ -46,10 +45,6 @@ export async function activate(context: ExtensionContext) {
4645
BazelRunTargetProvider.instance
4746
);
4847
tasks.registerTaskProvider('bazel', new BazelTaskProvider());
49-
window.registerTreeDataProvider(
50-
'rootFileViewer',
51-
RootFileViewProvider.instance
52-
);
5348

5449
BazelLanguageServerTerminal.trace('extension activated');
5550

src/projectViewManager.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ export namespace ProjectViewManager {
7777

7878
async function getDisplayFolders(): Promise<string[]> {
7979
let displayFolders = new Set<string>(['.eclipse']); // TODO bubble this out to a setting
80+
if (isMultiRoot()) {
81+
displayFolders.add('.');
82+
}
8083
try {
8184
const bazelProjectFile = await getBazelProjectFile();
8285
if (bazelProjectFile.directories.includes('.')) {
@@ -164,11 +167,11 @@ export namespace ProjectViewManager {
164167
k.includes('.eclipse')
165168
).length;
166169

167-
const viewAll = displayFolders.includes('.');
170+
const viewAll = displayFolders.includes('.') && !isMultiRoot();
168171

169172
const fileWatcherExcludePattern = viewAll
170173
? ''
171-
: `**/!(${Array.from(displayFolders.sort()).join('|')})/**`;
174+
: `**/!(${Array.from(displayFolders.filter((s) => s !== '.').sort()).join('|')})/**`;
172175

173176
if (viewAll) {
174177
// if viewAll and existing config doesn't contain .eclipse return

src/provider/rootFileViewProvider.ts

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)