Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(vscode): add useVSCodeProxy option to control whether to use Vscode Proxy #3440

Merged
merged 8 commits into from
Nov 22, 2024
Merged

chore(vscode): add useVSCodeProxy option to control whether to use Vscode Proxy #3440

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c9946b1
fix(vscode): check weather proxy url is in noProxy field
antimonyGu Nov 19, 2024
2c2a2f5
recover change
antimonyGu Nov 19, 2024
026079e
[autofix.ci] apply automated fixes
autofix-ci[bot] Nov 19, 2024
7cea43d
fix(vscode): provide AdvancedSettings.disableProxy to bypass the proxy
antimonyGu Nov 20, 2024
ed6c502
[autofix.ci] apply automated fixes
autofix-ci[bot] Nov 20, 2024
bbe15f7
fix comments
antimonyGu Nov 21, 2024
f02d202
[autofix.ci] apply automated fixes
autofix-ci[bot] Nov 21, 2024
6f72929
fix useVSCodeProxy default value
antimonyGu Nov 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions clients/vscode/src/Config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { getLogger } from "./logger";
interface AdvancedSettings {
"inlineCompletion.triggerMode"?: "automatic" | "manual";
"chatEdit.history"?: number;
useVSCodeProxy?: boolean;
}

export interface PastServerConfig {
Expand Down Expand Up @@ -73,6 +74,11 @@ export class Config extends EventEmitter {
}
}

get useVSCodeProxy(): boolean {
const advancedSettings = this.workspace.get("settings.advanced", {}) as AdvancedSettings;
return advancedSettings["useVSCodeProxy"] ?? true;
}

get maxChatEditHistory(): number {
const advancedSettings = this.workspace.get("settings.advanced", {}) as AdvancedSettings;
const numHistory = advancedSettings["chatEdit.history"] === undefined ? 20 : advancedSettings["chatEdit.history"];
Expand Down Expand Up @@ -184,12 +190,15 @@ export class Config extends EventEmitter {
}

buildClientProvidedConfig(): ClientProvidedConfig {
const url = this.useVSCodeProxy ? this.url : "";
const authorization = this.useVSCodeProxy ? this.authorization : "";

return {
// Note: current we only support http.proxy | http.authorization
// More properties we will land later.
proxy: {
url: this.url,
authorization: this.authorization,
url,
authorization,
},
server: {
endpoint: this.serverEndpoint,
Expand Down