Command to report notebook nes issue (#687)

Author: DonJayamanne

package.json

@@ -1912,6 +1912,12 @@
 				"title": "%github.copilot.command.inlineEdit.clearCache%",
 				"category": "Developer"
 			},
+			{
+				"command": "github.copilot.debug.inlineEdit.reportNotebookNESIssue",
+				"title": "%github.copilot.command.inlineEdit.reportNotebookNESIssue%",
+				"enablement": "config.github.copilot.chat.advanced.notebook.alternativeNESFormat.enabled",
+				"category": "GitHub Copilot Developer"
+			},
 			{
 				"command": "github.copilot.debug.generateSTest",
 				"title": "%github.copilot.command.generateSTest%",

package.nls.json

@@ -182,6 +182,7 @@
 	"github.copilot.chat.attachSelection": "Add Selection to Chat",
 	"github.copilot.command.collectDiagnostics": "GitHub Copilot Chat Diagnostics",
 	"github.copilot.command.inlineEdit.clearCache": "GitHub Copilot Chat Clear Next Edit Cache",
+	"github.copilot.command.inlineEdit.reportNotebookNESIssue": "Report Notebook Next Edit Issue",
 	"github.copilot.command.showNotebookLog": "Show Chat Log Notebook",
 	"github.copilot.resetAutomaticCommandExecutionPrompt": "Reset Automatic Command Execution Prompt",
 	"github.copilot.command.generateSTest": "Generate STest From Last Chat Request",

src/extension/inlineEdits/vscode-node/components/inlineEditDebugComponent.ts

@@ -17,7 +17,7 @@ import { XtabProvider } from '../../../xtab/node/xtabProvider';
 import { defaultNextEditProviderId } from '../../node/createNextEditProvider';
 import { DebugRecorder } from '../../node/debugRecorder';
 
-const reportFeedbackCommandId = 'github.copilot.debug.inlineEdit.reportFeedback';
+export const reportFeedbackCommandId = 'github.copilot.debug.inlineEdit.reportFeedback';
 const pickProviderId = 'github.copilot.debug.inlineEdit.pickProvider';
 
 export type InlineCompletionCommand = { command: Command; icon: ThemeIcon };
@@ -73,7 +73,9 @@ export class InlineEditDebugComponent extends Disposable {
 
 				{
 					const uiRepro = await extractInlineEditRepro();
-					data.appendSection('UI Repro', ['```', uiRepro, '```']);
+					if (uiRepro) {
+						data.appendSection('UI Repro', ['```', uiRepro, '```']);
+					}
 				}
 			}
 
@@ -208,8 +210,8 @@ export function filterLogForSensitiveFiles(log: LogEntry[]): LogEntry[] {
 
 async function extractInlineEditRepro() {
 	const commandId = 'editor.action.inlineSuggest.dev.extractRepro';
-	const result: { reproCase: string } = await commands.executeCommand(commandId);
-	return result.reproCase;
+	const result: { reproCase: string } | undefined = await commands.executeCommand(commandId);
+	return result?.reproCase;
 }
 
 class SimpleMarkdownBuilder {

src/extension/inlineEdits/vscode-node/inlineCompletionProvider.ts

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { CancellationToken, Command, InlineCompletionContext, InlineCompletionDisplayLocation, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReason, InlineCompletionEndOfLifeReasonKind, InlineCompletionItem, InlineCompletionItemProvider, InlineCompletionList, InlineCompletionsDisposeReason, InlineCompletionsDisposeReasonKind, Position, Range, TextDocument, TextDocumentShowOptions, l10n, Event as vscodeEvent } from 'vscode';
+import { CancellationToken, Command, InlineCompletionContext, InlineCompletionDisplayLocation, InlineCompletionDisplayLocationKind, InlineCompletionEndOfLifeReason, InlineCompletionEndOfLifeReasonKind, InlineCompletionItem, InlineCompletionItemProvider, InlineCompletionList, InlineCompletionsDisposeReason, InlineCompletionsDisposeReasonKind, Position, Range, TextDocument, TextDocumentShowOptions, l10n, Event as vscodeEvent, workspace } from 'vscode';
 import { ConfigKey, IConfigurationService } from '../../../platform/configuration/common/configurationService';
 import { IDiffService } from '../../../platform/diff/common/diffService';
 import { stringEditFromDiff } from '../../../platform/editing/common/edit';
@@ -36,6 +36,7 @@ import { isInlineSuggestion } from './isInlineSuggestion';
 import { InlineEditLogger } from './parts/inlineEditLogger';
 import { toExternalRange } from './utils/translations';
 import { IVSCodeObservableDocument } from './parts/vscodeWorkspace';
+import { findNotebook, isNotebookCell } from '../../../util/common/notebooks';
 
 const learnMoreAction: Command = {
 	title: l10n.t('Learn More'),
@@ -155,7 +156,8 @@ export class InlineCompletionProviderImpl implements InlineCompletionItemProvide
 			return undefined;
 		}
 
-		const logContext = new InlineEditRequestLogContext(doc.id.uri, document.version, context);
+		const documentVersion = (isNotebookCell(document.uri) ? findNotebook(document.uri, workspace.notebookDocuments)?.version : undefined) || document.version;
+		const logContext = new InlineEditRequestLogContext(doc.id.uri, documentVersion, context);
 		logContext.recordingBookmark = this.model.debugRecorder.createBookmark();
 
 		const telemetryBuilder = new NextEditProviderTelemetryBuilder(this._gitExtensionService, this._notebookService, this.model.nextEditProvider.ID, doc, this.model.debugRecorder, logContext.recordingBookmark);

src/extension/inlineEdits/vscode-node/inlineEditProviderFeature.ts

@@ -21,7 +21,7 @@ import { IInstantiationService } from '../../../util/vs/platform/instantiation/c
 import { IExtensionContribution } from '../../common/contributions';
 import { CompletionsProvider } from '../../completions/vscode-node/completionsProvider';
 import { TelemetrySender } from '../node/nextEditProviderTelemetry';
-import { InlineEditDebugComponent } from './components/inlineEditDebugComponent';
+import { InlineEditDebugComponent, reportFeedbackCommandId } from './components/inlineEditDebugComponent';
 import { LogContextRecorder } from './components/logContextRecorder';
 import { DiagnosticsNextEditProvider } from './features/diagnosticsInlineEditProvider';
 import { InlineCompletionProviderImpl } from './inlineCompletionProvider';
@@ -30,6 +30,8 @@ import { InlineEditLogger } from './parts/inlineEditLogger';
 import { LastEditTimeTracker } from './parts/lastEditTimeTracker';
 import { VSCodeWorkspace } from './parts/vscodeWorkspace';
 import { makeSettable } from './utils/observablesUtils';
+import { isNotebookCell } from '../../../util/common/notebooks';
+import { InlineEditRequestLogContext } from '../../../platform/inlineEdits/common/inlineEditLogContext';
 
 const TRIGGER_INLINE_EDIT_ON_ACTIVE_EDITOR_CHANGE = false; // otherwise, eg, NES would trigger just when going through search results
 
@@ -72,7 +74,7 @@ export class InlineEditProviderFeature extends Disposable implements IExtensionC
 		@IEnvService private readonly _envService: IEnvService,
 		@ILogService private readonly _logService: ILogService,
 		@IInstantiationService private readonly _instantiationService: IInstantiationService,
-		@IVSCodeExtensionContext private readonly _extensionContext: IVSCodeExtensionContext
+		@IVSCodeExtensionContext private readonly _extensionContext: IVSCodeExtensionContext,
 	) {
 		super();
 
@@ -153,6 +155,23 @@ export class InlineEditProviderFeature extends Disposable implements IExtensionC
 			reader.store.add(commands.registerCommand(clearCacheCommandId, () => {
 				model.nextEditProvider.clearCache();
 			}));
+
+			reader.store.add(commands.registerCommand(reportNotebookNESIssueCommandId, () => {
+				const activeNotebook = window.activeNotebookEditor;
+				const document = window.activeTextEditor?.document;
+				if (!activeNotebook || !document || !isNotebookCell(document.uri)) {
+					return;
+				}
+				const doc = model.workspace.getDocumentByTextDocument(document);
+				const selection = activeNotebook.selection;
+				if (!selection || !doc) {
+					return;
+				}
+
+				const logContext = new InlineEditRequestLogContext(doc.id.uri, document.version, undefined);
+				logContext.recordingBookmark = model.debugRecorder.createBookmark();
+				void commands.executeCommand(reportFeedbackCommandId, { logContext });
+			}));
 		}));
 
 		constructorTracer.returns();
@@ -164,3 +183,4 @@ export const learnMoreCommandId = 'github.copilot.debug.inlineEdit.learnMore';
 export const learnMoreLink = 'https://aka.ms/vscode-nes';
 
 const clearCacheCommandId = 'github.copilot.debug.inlineEdit.clearCache';
+const reportNotebookNESIssueCommandId = 'github.copilot.debug.inlineEdit.reportNotebookNESIssue';

src/platform/configuration/common/configurationService.ts

@@ -616,7 +616,7 @@ export namespace ConfigKey {
 		/** Enable filtering variables by cell document symbols */
 		export const NotebookVariableFilteringEnabled = defineSetting('chat.advanced.notebook.variableFilteringEnabled', false, INTERNAL);
 		export const NotebookAlternativeDocumentFormat = defineExpSetting<AlternativeNotebookFormat>('chat.advanced.notebook.alternativeFormat', AlternativeNotebookFormat.xml, INTERNAL);
-		export const UseAlternativeNESNotebookFormat = defineExpSetting<boolean>('chat.advanced.notebook.alternativeNESFormat', false, INTERNAL);
+		export const UseAlternativeNESNotebookFormat = defineExpSetting<boolean>('chat.advanced.notebook.alternativeNESFormat.enabled', false, INTERNAL);
 		export const TerminalToDebuggerPatterns = defineSetting<string[]>('chat.advanced.debugTerminalCommandPatterns', [], INTERNAL);
 		export const InlineEditsIgnoreCompletionsDisablement = defineValidatedSetting<boolean>('chat.advanced.inlineEdits.ignoreCompletionsDisablement', vBoolean(), false, INTERNAL_RESTRICTED);
 		export const InlineEditsAsyncCompletions = defineExpSetting<boolean>('chat.advanced.inlineEdits.asyncCompletions', true, INTERNAL_RESTRICTED);