naming, formatting

Author: amunger

src/vs/workbench/api/browser/mainThreadNotebookKernels.ts

@@ -37,7 +37,7 @@ abstract class MainThreadKernel implements INotebookKernel {
 	detail?: string;
 	supportedLanguages: string[];
 	implementsExecutionOrder: boolean;
-	providesVariables: boolean;
+	hasVariableProvider: boolean;
 	localResourceRoot: URI;
 
 	public get preloadUris() {
@@ -59,7 +59,7 @@ abstract class MainThreadKernel implements INotebookKernel {
 		this.detail = data.detail;
 		this.supportedLanguages = isNonEmptyArray(data.supportedLanguages) ? data.supportedLanguages : _languageService.getRegisteredLanguageIds();
 		this.implementsExecutionOrder = data.supportsExecutionOrder ?? false;
-		this.providesVariables = data.providesVariables ?? false;
+		this.hasVariableProvider = data.hasVariableProvider ?? false;
 		this.localResourceRoot = URI.revive(data.extensionLocation);
 		this.preloads = data.preloads?.map(u => ({ uri: URI.revive(u.uri), provides: u.provides })) ?? [];
 	}
@@ -92,8 +92,8 @@ abstract class MainThreadKernel implements INotebookKernel {
 			this.implementsInterrupt = data.supportsInterrupt;
 			event.hasInterruptHandler = true;
 		}
-		if (data.providesVariables !== undefined) {
-			this.providesVariables = data.providesVariables;
+		if (data.hasVariableProvider !== undefined) {
+			this.hasVariableProvider = data.hasVariableProvider;
 			event.hasVariableProvider = true;
 		}
 		this._onDidChange.fire(event);

src/vs/workbench/api/common/extHost.protocol.ts

@@ -1076,7 +1076,7 @@ export interface INotebookKernelDto2 {
 	supportsInterrupt?: boolean;
 	supportsExecutionOrder?: boolean;
 	preloads?: { uri: UriComponents; provides: readonly string[] }[];
-	providesVariables?: boolean;
+	hasVariableProvider?: boolean;
 }
 
 export interface INotebookProxyKernelDto {

src/vs/workbench/api/common/extHostNotebookKernels.ts

@@ -210,7 +210,7 @@ export class ExtHostNotebookKernels implements ExtHostNotebookKernelsShape {
 			},
 			set variableProvider(value) {
 				_variableProvider = value;
-				data.providesVariables = !!value;
+				data.hasVariableProvider = !!value;
 				_update();
 			},
 			get variableProvider() {
@@ -425,10 +425,12 @@ export class ExtHostNotebookKernels implements ExtHostNotebookKernelsShape {
 			return;
 		}
 
-
 		const parent = parentName ? { name: parentName, value: '' } : undefined;
 		const variables = variableProvider.provideVariables(document.apiNotebook, parent, kind, start, token);
 		for await (const variable of variables) {
+			if (token.isCancellationRequested) {
+				return;
+			}
 			this._proxy.$receiveVariable(requestId, variable);
 		}
 	}

src/vs/workbench/api/common/extHostTypes.ts

@@ -3798,8 +3798,6 @@ export class NotebookKernelSourceAction {
 	) { }
 }
 
-
-
 //#endregion
 
 //#region Timeline

src/vs/workbench/contrib/notebook/browser/contrib/notebookVariables/notebookVariablesView.ts

@@ -107,7 +107,7 @@ export class NotebookVariablesView extends ViewPane {
 
 	private async updateVariables(notebook: NotebookTextModel) {
 		const selectedKernel = this.notebookKernelService.getMatchingKernel(notebook).selected;
-		if (selectedKernel && selectedKernel.providesVariables) {
+		if (selectedKernel && selectedKernel.hasVariableProvider) {
 
 			const variables = selectedKernel.provideVariables(notebook.uri, undefined, 'named', 0, CancellationToken.None);
 			const treeData = await variables

src/vs/workbench/contrib/notebook/common/notebookKernelService.ts

@@ -65,7 +65,7 @@ export interface INotebookKernel {
 	supportedLanguages: string[];
 	implementsInterrupt?: boolean;
 	implementsExecutionOrder?: boolean;
-	providesVariables?: boolean;
+	hasVariableProvider?: boolean;
 
 	executeNotebookCellsRequest(uri: URI, cellHandles: number[]): Promise<void>;
 	cancelNotebookCellExecution(uri: URI, cellHandles: number[]): Promise<void>;

src/vscode-dts/vscode.proposed.notebookVariableProvider.d.ts

@@ -9,7 +9,7 @@ declare module 'vscode' {
 		variableProvider?: NotebookVariableProvider;
 	}
 
-	export type VariablesRequestKind = 'named' | 'indexed';
+	type VariablesRequestKind = 'named' | 'indexed';
 
 	interface VariablesResult {
 		variable: Variable;