From f1663d9615edee825b4f3e077183aeb4c781361b Mon Sep 17 00:00:00 2001 From: Shreya Keshive Date: Thu, 7 Aug 2025 17:25:06 -0400 Subject: [PATCH] README + reduce required VS Code version for companion extension (#5719) --- package-lock.json | 18 +++++++++--------- packages/vscode-ide-companion/README.md | 6 +++++- packages/vscode-ide-companion/package.json | 4 ++-- .../vscode-ide-companion/src/diff-manager.ts | 10 +++------- packages/vscode-ide-companion/src/extension.ts | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index e254cab8..2efb7e40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2511,13 +2511,6 @@ "boxen": "^7.1.1" } }, - "node_modules/@types/vscode": { - "version": "1.102.0", - "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.102.0.tgz", - "integrity": "sha512-V9sFXmcXz03FtYTSUsYsu5K0Q9wH9w9V25slddcxrh5JgORD14LpnOA7ov0L9ALi+6HrTjskLJ/tY5zeRF3TFA==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/ws": { "version": "8.18.1", "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz", @@ -12029,7 +12022,7 @@ "@types/cors": "^2.8.19", "@types/express": "^5.0.3", "@types/node": "20.x", - "@types/vscode": "^1.101.0", + "@types/vscode": "^1.99.0", "@typescript-eslint/eslint-plugin": "^8.31.1", "@typescript-eslint/parser": "^8.31.1", "esbuild": "^0.25.3", @@ -12039,8 +12032,15 @@ "vitest": "^3.2.4" }, "engines": { - "vscode": "^1.101.0" + "vscode": "^1.99.0" } + }, + "packages/vscode-ide-companion/node_modules/@types/vscode": { + "version": "1.99.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.99.0.tgz", + "integrity": "sha512-30sjmas1hQ0gVbX68LAWlm/YYlEqUErunPJJKLpEl+xhK0mKn+jyzlCOpsdTwfkZfPy4U6CDkmygBLC3AB8W9Q==", + "dev": true, + "license": "MIT" } } } diff --git a/packages/vscode-ide-companion/README.md b/packages/vscode-ide-companion/README.md index 1b96d7f3..49de94a1 100644 --- a/packages/vscode-ide-companion/README.md +++ b/packages/vscode-ide-companion/README.md @@ -8,11 +8,15 @@ The Gemini CLI Companion extension seamlessly integrates [Gemini CLI](https://gi - Selection Context: Gemini CLI can easily access your cursor's position and selected text within the editor, giving it valuable context directly from your current work. +- Native Diffing: Seamlessly view, modify, and accept code changes suggested by Gemini CLI directly within the editor. + +- Launch Gemini CLI: Quickly start a new Gemini CLI session from the Command Palette (Cmd+Shift+P or Ctrl+Shift+P) by running the "Gemini CLI: Run" command. + # Requirements To use this extension, you'll need: -- VS Code version 1.101.0 or newer +- VS Code version 1.99.0 or newer - Gemini CLI (installed separately) running within the VS Code integrated terminal # Terms of Service and Privacy Notice diff --git a/packages/vscode-ide-companion/package.json b/packages/vscode-ide-companion/package.json index aee14e32..2ed5cd21 100644 --- a/packages/vscode-ide-companion/package.json +++ b/packages/vscode-ide-companion/package.json @@ -11,7 +11,7 @@ "directory": "packages/vscode-ide-companion" }, "engines": { - "vscode": "^1.101.0" + "vscode": "^1.99.0" }, "license": "LICENSE", "preview": true, @@ -113,7 +113,7 @@ "@types/cors": "^2.8.19", "@types/express": "^5.0.3", "@types/node": "20.x", - "@types/vscode": "^1.101.0", + "@types/vscode": "^1.99.0", "@typescript-eslint/eslint-plugin": "^8.31.1", "@typescript-eslint/parser": "^8.31.1", "esbuild": "^0.25.3", diff --git a/packages/vscode-ide-companion/src/diff-manager.ts b/packages/vscode-ide-companion/src/diff-manager.ts index 0dad03a6..d2a53b54 100644 --- a/packages/vscode-ide-companion/src/diff-manager.ts +++ b/packages/vscode-ide-companion/src/diff-manager.ts @@ -56,7 +56,7 @@ export class DiffManager { private diffDocuments = new Map(); constructor( - private readonly logger: vscode.OutputChannel, + private readonly log: (message: string) => void, private readonly diffContentProvider: DiffContentProvider, ) {} @@ -151,9 +151,7 @@ export class DiffManager { async acceptDiff(rightDocUri: vscode.Uri) { const diffInfo = this.diffDocuments.get(rightDocUri.toString()); if (!diffInfo) { - this.logger.appendLine( - `No diff info found for ${rightDocUri.toString()}`, - ); + this.log(`No diff info found for ${rightDocUri.toString()}`); return; } @@ -179,9 +177,7 @@ export class DiffManager { async cancelDiff(rightDocUri: vscode.Uri) { const diffInfo = this.diffDocuments.get(rightDocUri.toString()); if (!diffInfo) { - this.logger.appendLine( - `No diff info found for ${rightDocUri.toString()}`, - ); + this.log(`No diff info found for ${rightDocUri.toString()}`); // Even if we don't have diff info, we should still close the editor. await this.closeDiffEditor(rightDocUri); return; diff --git a/packages/vscode-ide-companion/src/extension.ts b/packages/vscode-ide-companion/src/extension.ts index 08389731..18217140 100644 --- a/packages/vscode-ide-companion/src/extension.ts +++ b/packages/vscode-ide-companion/src/extension.ts @@ -42,7 +42,7 @@ export async function activate(context: vscode.ExtensionContext) { updateWorkspacePath(context); const diffContentProvider = new DiffContentProvider(); - const diffManager = new DiffManager(logger, diffContentProvider); + const diffManager = new DiffManager(log, diffContentProvider); context.subscriptions.push( vscode.workspace.onDidCloseTextDocument((doc) => {