Add code location to execute() method of language runtimes

Author: lionel-

src/positron-dts/positron.d.ts

@@ -1079,12 +1079,16 @@ declare module 'positron' {
 		 * @param id The ID of the code
 		 * @param mode The code execution mode
 		 * @param errorBehavior The code execution error behavior
+		 * @param location Optionally, the location of `code` in the source editor.
 		 * Note: The errorBehavior parameter is currently ignored by kernels
 		 */
-		execute(code: string,
+		execute(
+			code: string,
 			id: string,
 			mode: RuntimeCodeExecutionMode,
-			errorBehavior: RuntimeErrorBehavior): void;
+			errorBehavior: RuntimeErrorBehavior,
+			codeLocation?: vscode.Location,
+		): void;
 
 		/**
 		 * Shut down the runtime; returns a Thenable that resolves when the

src/vs/workbench/api/browser/positron/mainThreadLanguageRuntime.ts

@@ -52,6 +52,7 @@ import { IPositronVariablesInstance } from '../../../services/positronVariables/
 import { isWebviewPreloadMessage, isWebviewReplayMessage } from '../../../services/positronIPyWidgets/common/webviewPreloadUtils.js';
 import { IOpenerService } from '../../../../platform/opener/common/opener.js';
 import { ActiveRuntimeSessionMetadata, LanguageRuntimeDynState } from 'positron';
+import { Location } from '../../../../editor/common/languages.js';
 
 /**
  * Represents a language runtime event (for example a message or state change)
@@ -461,9 +462,24 @@ class ExtHostLanguageRuntimeSessionAdapter extends Disposable implements ILangua
 		return this._proxy.$openResource(this.handle, resource);
 	}
 
-	execute(code: string, id: string, mode: RuntimeCodeExecutionMode, errorBehavior: RuntimeErrorBehavior): void {
+	execute(
+		code: string,
+		id: string,
+		mode: RuntimeCodeExecutionMode,
+		errorBehavior: RuntimeErrorBehavior,
+		attribution?: IConsoleCodeAttribution,
+	): void {
 		this._lastUsed = Date.now();
-		this._proxy.$executeCode(this.handle, code, id, mode, errorBehavior);
+
+		let codeLocation: Location | undefined = undefined;
+
+		// For now we only provide source locations for scripts, but we might be
+		// able to provide it for notebooks as well
+		if (attribution?.source === CodeAttributionSource.Script) {
+			codeLocation = attribution.metadata?.codeLocation;
+		}
+
+		this._proxy.$executeCode(this.handle, code, id, mode, errorBehavior, codeLocation);
 	}
 
 	isCodeFragmentComplete(code: string): Thenable<RuntimeCodeFragmentStatus> {

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

@@ -19,6 +19,7 @@ import { PlotRenderSettings } from '../../../services/positronPlots/common/posit
 import { QueryTableSummaryResult, Variable } from '../../../services/languageRuntime/common/positronVariablesComm.js';
 import { ILanguageRuntimeCodeExecutedEvent } from '../../../services/positronConsole/common/positronConsoleCodeExecution.js';
 import { IPositronChatProvider } from '../../../contrib/chat/common/languageModels.js';
+import { Location } from '../../../../editor/common/languages.js';
 
 // NOTE: This check is really to ensure that extHost.protocol is included by the TypeScript compiler
 // as a dependency of this module, and therefore that it's initialized first. This is to avoid a
@@ -76,7 +77,7 @@ export interface ExtHostLanguageRuntimeShape {
 	$disposeLanguageRuntime(handle: number): Promise<void>;
 	$startLanguageRuntime(handle: number): Promise<ILanguageRuntimeInfo>;
 	$openResource(handle: number, resource: URI | string): Promise<boolean>;
-	$executeCode(handle: number, code: string, id: string, mode: RuntimeCodeExecutionMode, errorBehavior: RuntimeErrorBehavior, executionId?: string): void;
+	$executeCode(handle: number, code: string, id: string, mode: RuntimeCodeExecutionMode, errorBehavior: RuntimeErrorBehavior, codeLocation?: Location, executionId?: string): void;
 	$isCodeFragmentComplete(handle: number, code: string): Promise<RuntimeCodeFragmentStatus>;
 	$createClient(handle: number, id: string, type: RuntimeClientType, params: any, metadata?: any): Promise<void>;
 	$listClients(handle: number, type?: RuntimeClientType): Promise<Record<string, string>>;

src/vs/workbench/api/common/positron/extHostLanguageRuntime.ts

@@ -7,6 +7,7 @@ import type * as positron from 'positron';
 import { debounce } from '../../../../base/common/decorators.js';
 import { ILanguageRuntimeMessage, ILanguageRuntimeMessageCommClosed, ILanguageRuntimeMessageCommData, ILanguageRuntimeMessageCommOpen, ILanguageRuntimeMessageStream, ILanguageRuntimeMessageOutput, ILanguageRuntimeMessageState, ILanguageRuntimeMetadata, LanguageRuntimeSessionMode, RuntimeCodeExecutionMode, RuntimeCodeFragmentStatus, RuntimeErrorBehavior, RuntimeState, ILanguageRuntimeMessageResult, ILanguageRuntimeMessageError, RuntimeOnlineState } from '../../../services/languageRuntime/common/languageRuntimeService.js';
 import * as extHostProtocol from './extHost.positron.protocol.js';
+import * as typeConverters from '../extHostTypeConverters.js';
 import { Emitter } from '../../../../base/common/event.js';
 import { DisposableStore, IDisposable } from '../../../../base/common/lifecycle.js';
 import { Disposable, LanguageRuntimeMessageType } from '../extHostTypes.js';
@@ -23,6 +24,7 @@ import { generateUuid } from '../../../../base/common/uuid.js';
 import { CancellationToken } from '../../../../base/common/cancellation.js';
 import { QueryTableSummaryResult, Variable } from '../../../services/languageRuntime/common/positronVariablesComm.js';
 import { ILanguageRuntimeCodeExecutedEvent } from '../../../services/positronConsole/common/positronConsoleCodeExecution.js';
+import { Location } from '../../../../editor/common/languages.js';
 
 /**
  * Interface for code execution observers
@@ -774,11 +776,17 @@ export class ExtHostLanguageRuntime implements extHostProtocol.ExtHostLanguageRu
 		return Promise.resolve(this._runtimeSessions[handle].openResource!(resource));
 	}
 
-	$executeCode(handle: number, code: string, id: string, mode: RuntimeCodeExecutionMode, errorBehavior: RuntimeErrorBehavior): void {
+	$executeCode(handle: number, code: string, id: string, mode: RuntimeCodeExecutionMode, errorBehavior: RuntimeErrorBehavior, codeLocation?: Location): void {
 		if (handle >= this._runtimeSessions.length) {
 			throw new Error(`Cannot execute code: session handle '${handle}' not found or no longer valid.`);
 		}
-		this._runtimeSessions[handle].execute(code, id, mode, errorBehavior);
+
+		let codeLocationConverted = undefined;
+		if (codeLocation) {
+			codeLocationConverted = typeConverters.Location.to(codeLocation);
+		}
+
+		this._runtimeSessions[handle].execute(code, id, mode, errorBehavior, codeLocationConverted);
 	}
 
 	$isCodeFragmentComplete(handle: number, code: string): Promise<RuntimeCodeFragmentStatus> {

src/vs/workbench/services/positronConsole/browser/positronConsoleService.ts

@@ -3048,7 +3048,9 @@ class PositronConsoleInstance extends Disposable implements IPositronConsoleInst
 			code,
 			id,
 			mode,
-			errorBehavior);
+			errorBehavior,
+			attribution,
+		);
 
 		// Create and fire the onDidExecuteCode event.
 		const event: ILanguageRuntimeCodeExecutedEvent = {

src/vs/workbench/services/runtimeSession/common/runtimeSessionService.ts

@@ -11,6 +11,7 @@ import { ILanguageRuntimeMetadata, LanguageRuntimeSessionMode, ILanguageRuntimeS
 import { RuntimeClientType, IRuntimeClientInstance } from '../../languageRuntime/common/languageRuntimeClientInstance.js';
 import { IDisposable } from '../../../../base/common/lifecycle.js';
 import { ActiveRuntimeSession } from './activeRuntimeSession.js';
+import { IConsoleCodeAttribution } from '../../positronConsole/common/positronConsoleCodeExecution.js';
 
 export const IRuntimeSessionService =
 	createDecorator<IRuntimeSessionService>('runtimeSessionService');
@@ -179,10 +180,13 @@ export interface ILanguageRuntimeSession extends IDisposable {
 	openResource(resource: URI | string): Thenable<boolean>;
 
 	/** Execute code in the runtime */
-	execute(code: string,
+	execute(
+		code: string,
 		id: string,
 		mode: RuntimeCodeExecutionMode,
-		errorBehavior: RuntimeErrorBehavior): void;
+		errorBehavior: RuntimeErrorBehavior,
+		attribution?: IConsoleCodeAttribution,
+	): void;
 
 	/** Test a code fragment for completeness */
 	isCodeFragmentComplete(code: string): Thenable<RuntimeCodeFragmentStatus>;