labelService: handle workspace paths without .code-workspace extension

aeschli · aeschli · commit 83d8f282e000 · 2019-04-01T15:52:45.000+02:00
diff --git a/src/vs/editor/contrib/snippet/snippetVariables.ts b/src/vs/editor/contrib/snippet/snippetVariables.ts
@@ -9,7 +9,7 @@ import { ITextModel } from 'vs/editor/common/model';
 import { Selection } from 'vs/editor/common/core/selection';
 import { VariableResolver, Variable, Text } from 'vs/editor/contrib/snippet/snippetParser';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
-import { getLeadingWhitespace, commonPrefixLength, isFalsyOrWhitespace, pad } from 'vs/base/common/strings';
+import { getLeadingWhitespace, commonPrefixLength, isFalsyOrWhitespace, pad, endsWith } from 'vs/base/common/strings';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { isSingleFolderWorkspaceIdentifier, toWorkspaceIdentifier, WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';
@@ -269,7 +269,10 @@ export class WorkspaceBasedVariableResolver implements VariableResolver {
 			return basename(workspaceIdentifier.path);
 		}
 
-		const filename = basename(workspaceIdentifier.configPath.path);
-		return filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
+		let filename = basename(workspaceIdentifier.configPath.path);
+		if (endsWith(filename, WORKSPACE_EXTENSION)) {
+			filename = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
+		}
+		return filename;
 	}
 }
diff --git a/src/vs/platform/label/common/label.ts b/src/vs/platform/label/common/label.ts
@@ -11,6 +11,7 @@ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'
 import { IWorkspaceIdentifier, ISingleFolderWorkspaceIdentifier, isSingleFolderWorkspaceIdentifier, WORKSPACE_EXTENSION } from 'vs/platform/workspaces/common/workspaces';
 import { localize } from 'vs/nls';
 import { isEqualOrParent, basename } from 'vs/base/common/resources';
+import { endsWith } from 'vs/base/common/strings';
 
 export interface ILabelService {
 	_serviceBrand: any;
@@ -54,9 +55,11 @@ export function getSimpleWorkspaceLabel(workspace: IWorkspaceIdentifier | URI, w
 		return localize('untitledWorkspace', "Untitled (Workspace)");
 	}
 
-	const filename = basename(workspace.configPath);
-	const workspaceName = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
-	return localize('workspaceName', "{0} (Workspace)", workspaceName);
+	let filename = basename(workspace.configPath);
+	if (endsWith(filename, WORKSPACE_EXTENSION)) {
+		filename = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
+	}
+	return localize('workspaceName', "{0} (Workspace)", filename);
 }
 
 
diff --git a/src/vs/workbench/services/label/common/labelService.ts b/src/vs/workbench/services/label/common/labelService.ts
@@ -182,13 +182,15 @@ export class LabelService implements ILabelService {
 		}
 
 		// Workspace: Saved
-		const filename = basename(workspace.configPath);
-		const workspaceName = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
+		let filename = basename(workspace.configPath);
+		if (endsWith(filename, WORKSPACE_EXTENSION)) {
+			filename = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);
+		}
 		let label;
 		if (options && options.verbose) {
-			label = localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(joinPath(dirname(workspace.configPath), workspaceName)));
+			label = localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(joinPath(dirname(workspace.configPath), filename)));
 		} else {
-			label = localize('workspaceName', "{0} (Workspace)", workspaceName);
+			label = localize('workspaceName', "{0} (Workspace)", filename);
 		}
 		return this.appendWorkspaceSuffix(label, workspace.configPath);
 	}

Original file line number	Diff line number	Diff line change
`@@ -182,13 +182,15 @@ export class LabelService implements ILabelService {`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`// Workspace: Saved`
`185`		`- const filename = basename(workspace.configPath);`
`186`		`- const workspaceName = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);`
	`185`	`+ let filename = basename(workspace.configPath);`
	`186`	`+ if (endsWith(filename, WORKSPACE_EXTENSION)) {`
	`187`	`+ filename = filename.substr(0, filename.length - WORKSPACE_EXTENSION.length - 1);`
	`188`	`+ }`
`187`	`189`	`let label;`
`188`	`190`	`if (options && options.verbose) {`
`189`		`- label = localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(joinPath(dirname(workspace.configPath), workspaceName)));`
	`191`	`+ label = localize('workspaceNameVerbose', "{0} (Workspace)", this.getUriLabel(joinPath(dirname(workspace.configPath), filename)));`
`190`	`192`	`} else {`
`191`		`- label = localize('workspaceName', "{0} (Workspace)", workspaceName);`
	`193`	`+ label = localize('workspaceName', "{0} (Workspace)", filename);`
`192`	`194`	`}`
`193`	`195`	`return this.appendWorkspaceSuffix(label, workspace.configPath);`
`194`	`196`	`}`