Marking that documents/workspaces arrays cannot be mutated

mjbvz · mjbvz · commit efb781e5beca · 2020-02-11T11:36:23.000-08:00
diff --git a/extensions/css-language-features/client/src/customData.ts b/extensions/css-language-features/client/src/customData.ts
@@ -13,7 +13,7 @@ interface ExperimentalConfig {
 	};
 }
 
-export function getCustomDataPathsInAllWorkspaces(workspaceFolders: WorkspaceFolder[] | undefined): string[] {
+export function getCustomDataPathsInAllWorkspaces(workspaceFolders: readonly WorkspaceFolder[] | undefined): string[] {
 	const dataPaths: string[] = [];
 
 	if (!workspaceFolders) {
diff --git a/extensions/html-language-features/client/src/customData.ts b/extensions/html-language-features/client/src/customData.ts
@@ -13,7 +13,7 @@ interface ExperimentalConfig {
 	};
 }
 
-export function getCustomDataPathsInAllWorkspaces(workspaceFolders: WorkspaceFolder[] | undefined): string[] {
+export function getCustomDataPathsInAllWorkspaces(workspaceFolders: readonly WorkspaceFolder[] | undefined): string[] {
 	const dataPaths: string[] = [];
 
 	if (!workspaceFolders) {
diff --git a/extensions/typescript-language-features/src/typescriptServiceClient.ts b/extensions/typescript-language-features/src/typescriptServiceClient.ts
@@ -634,7 +634,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType
 	}
 
 	public getWorkspaceRootForResource(resource: vscode.Uri): string | undefined {
-		const roots = vscode.workspace.workspaceFolders;
+		const roots = vscode.workspace.workspaceFolders ? Array.from(vscode.workspace.workspaceFolders) : undefined;
 		if (!roots || !roots.length) {
 			return undefined;
 		}
diff --git a/src/vs/vscode.d.ts b/src/vs/vscode.d.ts
@@ -8435,7 +8435,7 @@ declare module 'vscode' {
 		 * List of workspace folders or `undefined` when no folder is open.
 		 * *Note* that the first entry corresponds to the value of `rootPath`.
 		 */
-		export const workspaceFolders: WorkspaceFolder[] | undefined;
+		export const workspaceFolders: ReadonlyArray<WorkspaceFolder> | undefined;
 
 		/**
 		 * The name of the workspace. `undefined` when no folder
@@ -8609,7 +8609,7 @@ declare module 'vscode' {
 		/**
 		 * All text documents currently known to the system.
 		 */
-		export const textDocuments: TextDocument[];
+		export const textDocuments: ReadonlyArray<TextDocument>;
 
 		/**
 		 * Opens a document. Will return early if this document is already open. Otherwise

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ interface ExperimentalConfig {`
`13`	`13`	`};`
`14`	`14`	`}`
`15`	`15`
`16`		`-export function getCustomDataPathsInAllWorkspaces(workspaceFolders: WorkspaceFolder[] \| undefined): string[] {`
	`16`	`+export function getCustomDataPathsInAllWorkspaces(workspaceFolders: readonly WorkspaceFolder[] \| undefined): string[] {`
`17`	`17`	`const dataPaths: string[] = [];`
`18`	`18`
`19`	`19`	`if (!workspaceFolders) {`
Original file line number	Diff line number	Diff line change
`@@ -634,7 +634,7 @@ export default class TypeScriptServiceClient extends Disposable implements IType`
`634`	`634`	`}`
`635`	`635`
`636`	`636`	`public getWorkspaceRootForResource(resource: vscode.Uri): string \| undefined {`
`637`		`- const roots = vscode.workspace.workspaceFolders;`
	`637`	`+ const roots = vscode.workspace.workspaceFolders ? Array.from(vscode.workspace.workspaceFolders) : undefined;`
`638`	`638`	`if (!roots \|\| !roots.length) {`
`639`	`639`	`return undefined;`
`640`	`640`	`}`