Fixes

Author: saoudrizwan

src/core/webview/ClineProvider.ts

@@ -1761,16 +1761,23 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 	}
 
 	// 'Add to Cline' context menu in editor and code action
-	async addSelectedCodeToChat(code: string, filePath: string, languageId: string) {
+	async addSelectedCodeToChat(code: string, filePath: string, languageId: string, diagnostics?: vscode.Diagnostic[]) {
 		// Ensure the sidebar view is visible
 		await vscode.commands.executeCommand("claude-dev.SidebarProvider.focus")
 		await delay(100)
 
 		// Post message to webview with the selected code
 		const fileMention = this.getFileMentionFromPath(filePath)
+
+		let input = `${fileMention}\n\`\`\`\n${code}\n\`\`\``
+		if (diagnostics) {
+			const problemsString = this.convertDiagnosticsToProblemsString(diagnostics)
+			input += `\nProblems:\n${problemsString}`
+		}
+
 		await this.postMessageToWebview({
 			type: "addToInput",
-			text: `${fileMention}\n\`\`\`\n${code}\n\`\`\``,
+			text: input,
 		})
 
 		console.log("addSelectedCodeToChat", code, filePath, languageId)
@@ -1804,7 +1811,15 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 		await delay(100)
 
 		const fileMention = this.getFileMentionFromPath(filePath)
+		const problemsString = this.convertDiagnosticsToProblemsString(diagnostics)
+		await this.initClineWithTask(
+			`Fix the following code in ${fileMention}\n\`\`\`\n${code}\n\`\`\`\n\nProblems:\n${problemsString}`,
+		)
 
+		console.log("fixWithCline", code, filePath, languageId, diagnostics, problemsString)
+	}
+
+	convertDiagnosticsToProblemsString(diagnostics: vscode.Diagnostic[]) {
 		let problemsString = ""
 		for (const diagnostic of diagnostics) {
 			let label: string
@@ -1828,12 +1843,8 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 			const source = diagnostic.source ? `${diagnostic.source} ` : ""
 			problemsString += `\n- [${source}${label}] Line ${line}: ${diagnostic.message}`
 		}
-
-		await this.initClineWithTask(
-			`Fix the following code in ${fileMention}\n\`\`\`\n${code}\n\`\`\`\n\nProblems:\n${problemsString.trim()}`,
-		)
-
-		console.log("fixWithCline", code, filePath, languageId, diagnostics, problemsString)
+		problemsString = problemsString.trim()
+		return problemsString
 	}
 
 	// Task history

src/extension.ts

@@ -194,7 +194,7 @@ export function activate(context: vscode.ExtensionContext) {
 	context.subscriptions.push(vscode.window.registerUriHandler({ handleUri }))
 
 	context.subscriptions.push(
-		vscode.commands.registerCommand("cline.addToChat", async (range?: vscode.Range) => {
+		vscode.commands.registerCommand("cline.addToChat", async (range?: vscode.Range, diagnostics?: vscode.Diagnostic[]) => {
 			const editor = vscode.window.activeTextEditor
 			if (!editor) {
 				return
@@ -214,7 +214,12 @@ export function activate(context: vscode.ExtensionContext) {
 			const languageId = editor.document.languageId
 
 			// Send to sidebar provider
-			await sidebarProvider.addSelectedCodeToChat(selectedText, filePath, languageId)
+			await sidebarProvider.addSelectedCodeToChat(
+				selectedText,
+				filePath,
+				languageId,
+				Array.isArray(diagnostics) ? diagnostics : undefined,
+			)
 		}),
 	)
 
@@ -280,19 +285,26 @@ export function activate(context: vscode.ExtensionContext) {
 					range: vscode.Range,
 					context: vscode.CodeActionContext,
 				): vscode.CodeAction[] {
-					// Always offer both actions
+					// Expand range to include surrounding 3 lines
+					const expandedRange = new vscode.Range(
+						Math.max(0, range.start.line - 3),
+						0,
+						Math.min(document.lineCount - 1, range.end.line + 3),
+						document.lineAt(Math.min(document.lineCount - 1, range.end.line + 3)).text.length,
+					)
+
 					const addAction = new vscode.CodeAction("Add to Cline", vscode.CodeActionKind.QuickFix)
 					addAction.command = {
 						command: "cline.addToChat",
 						title: "Add to Cline",
-						arguments: [range],
+						arguments: [expandedRange, context.diagnostics],
 					}
 
 					const fixAction = new vscode.CodeAction("Fix with Cline", vscode.CodeActionKind.QuickFix)
 					fixAction.command = {
 						command: "cline.fixWithCline",
 						title: "Fix with Cline",
-						arguments: [range, context.diagnostics],
+						arguments: [expandedRange, context.diagnostics],
 					}
 
 					// Only show actions when there are errors

webview-ui/src/components/settings/ApiOptions.tsx

@@ -1357,7 +1357,7 @@ const ApiOptions = ({ showModelOptions, apiErrorMessage, modelIdErrorMessage, is
 			{(selectedProvider === "openrouter" || selectedProvider === "cline") && showModelOptions && (
 				<>
 					<VSCodeCheckbox
-						style={{ marginTop: -10 }}
+						style={{ marginTop: -8 }}
 						checked={providerSortingSelected}
 						onChange={(e: any) => {
 							const isChecked = e.target.checked === true