Skip to content

Commit a10a6d2

Browse files
committed
Fix a couple more cases
1 parent 2cbba0b commit a10a6d2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Extension/src/LanguageServer/configurations.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ export class CppProperties {
264264
// not for each notifying folder.
265265
const savedDocWorkspaceFolder: vscode.WorkspaceFolder | undefined = vscode.workspace.getWorkspaceFolder(doc.uri);
266266
const notifyingWorkspaceFolder: vscode.WorkspaceFolder | undefined = vscode.workspace.getWorkspaceFolder(vscode.Uri.file(settingsPath));
267-
if ((!savedDocWorkspaceFolder && vscode.workspace.workspaceFolders && notifyingWorkspaceFolder === vscode.workspace.workspaceFolders[0])
267+
if ((!savedDocWorkspaceFolder && vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0 && notifyingWorkspaceFolder === vscode.workspace.workspaceFolders[0])
268268
|| savedDocWorkspaceFolder === notifyingWorkspaceFolder) {
269269
let fileType: string | undefined;
270270
const documentPath: string = doc.uri.fsPath.toLowerCase();

Extension/src/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1272,7 +1272,7 @@ function getUniqueWorkspaceNameHelper(workspaceFolder: vscode.WorkspaceFolder, a
12721272
return workspaceFolderName; // No duplicate names to search for.
12731273
}
12741274
for (let i: number = 0; i < workspaceFolder.index; ++i) {
1275-
if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders[i].name === workspaceFolderName) {
1275+
if (vscode.workspace.workspaceFolders && vscode.workspace.workspaceFolders.length > 0 && vscode.workspace.workspaceFolders[i].name === workspaceFolderName) {
12761276
return addSubfolder ? path.join(workspaceFolderName, String(workspaceFolder.index)) : // Use the index as a subfolder.
12771277
workspaceFolderName + String(workspaceFolder.index);
12781278
}

0 commit comments

Comments
 (0)