mirror of
https://github.com/Microsoft/vscode
synced 2024-10-01 08:50:48 +00:00
parent
3c3ba581e5
commit
55046fccac
|
@ -13,7 +13,6 @@ import { Schemas } from 'vs/base/common/network';
|
|||
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
|
||||
import { IWorkspaceTagsService, Tags } from 'vs/workbench/contrib/tags/common/workspaceTags';
|
||||
import { getHashedRemotesFromConfig } from 'vs/workbench/contrib/tags/electron-sandbox/workspaceTags';
|
||||
import { IProductService } from 'vs/platform/product/common/productService';
|
||||
import { splitLines } from 'vs/base/common/strings';
|
||||
import { MavenArtifactIdRegex, MavenDependenciesRegex, MavenDependencyRegex, GradleDependencyCompactRegex, GradleDependencyLooseRegex, MavenGroupIdRegex, JavaLibrariesToLookFor } from 'vs/workbench/contrib/tags/common/javaWorkspaceTags';
|
||||
|
||||
|
@ -253,7 +252,6 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
|
|||
@IFileService private readonly fileService: IFileService,
|
||||
@IWorkspaceContextService private readonly contextService: IWorkspaceContextService,
|
||||
@IWorkbenchEnvironmentService private readonly environmentService: IWorkbenchEnvironmentService,
|
||||
@IProductService private readonly productService: IProductService,
|
||||
@ITextFileService private readonly textFileService: ITextFileService
|
||||
) { }
|
||||
|
||||
|
@ -582,7 +580,7 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
|
|||
tags['workspace.roots'] = isEmpty ? 0 : workspace.folders.length;
|
||||
tags['workspace.empty'] = isEmpty;
|
||||
|
||||
const folders = !isEmpty ? workspace.folders.map(folder => folder.uri) : this.productService.quality !== 'stable' && this.findFolders();
|
||||
const folders = !isEmpty ? workspace.folders.map(folder => folder.uri) : undefined;
|
||||
if (!folders || !folders.length) {
|
||||
return Promise.resolve(tags);
|
||||
}
|
||||
|
@ -809,32 +807,6 @@ export class WorkspaceTagsService implements IWorkspaceTagsService {
|
|||
}
|
||||
}
|
||||
|
||||
private findFolders(): URI[] | undefined {
|
||||
const folder = this.findFolder();
|
||||
return folder && [folder];
|
||||
}
|
||||
|
||||
private findFolder(): URI | undefined {
|
||||
const { filesToOpenOrCreate, filesToDiff, filesToMerge } = this.environmentService;
|
||||
if (filesToOpenOrCreate && filesToOpenOrCreate.length) {
|
||||
return this.parentURI(filesToOpenOrCreate[0].fileUri);
|
||||
} else if (filesToDiff && filesToDiff.length) {
|
||||
return this.parentURI(filesToDiff[0].fileUri);
|
||||
} else if (filesToMerge && filesToMerge.length === 4) {
|
||||
return this.parentURI(filesToMerge[3].fileUri) /* [3] is the resulting merge file */;
|
||||
}
|
||||
return undefined;
|
||||
}
|
||||
|
||||
private parentURI(uri: URI | undefined): URI | undefined {
|
||||
if (!uri) {
|
||||
return undefined;
|
||||
}
|
||||
const path = uri.path;
|
||||
const i = path.lastIndexOf('/');
|
||||
return i !== -1 ? uri.with({ path: path.substr(0, i) }) : undefined;
|
||||
}
|
||||
|
||||
private searchArray(arr: string[], regEx: RegExp): boolean | undefined {
|
||||
return arr.some(v => v.search(regEx) > -1) || undefined;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue