From 93e70c62f1688b62a02f83be6c742c27b728d9af Mon Sep 17 00:00:00 2001 From: Mark Percival Date: Thu, 21 Nov 2024 13:13:54 -0800 Subject: [PATCH] Chore: Prettier for consistant formatting (#794) * Chore: Pretier for consistant formatting - TODO: This PR needs to be updated by Saoud after he runs `npm install` & `npm format:fix` and commits the results of the prettier changes. * Revert prettier config * Run npm install * Fix prettier config and ignore package lock * Run format --------- Co-authored-by: Saoud Rizwan <7799382+saoudrizwan@users.noreply.github.com> --- .eslintrc.json | 54 +- .prettierignore | 3 +- .prettierrc.json | 4 +- .vscode-test.mjs | 6 +- .vscode/extensions.json | 10 +- .vscode/launch.json | 8 +- .vscode/settings.json | 22 +- .vscode/tasks.json | 99 +-- package-lock.json | 17 + package.json | 365 ++++---- src/api/providers/anthropic.ts | 10 +- src/api/providers/lmstudio.ts | 2 +- src/api/transform/gemini-format.ts | 8 +- src/api/transform/o1-format.ts | 6 +- src/api/transform/openai-format.ts | 10 +- src/core/Cline.ts | 103 +-- src/core/mentions/index.ts | 4 +- src/core/prompts/responses.ts | 6 +- src/core/prompts/system.ts | 2 +- src/core/sliding-window/index.ts | 2 +- src/core/webview/ClineProvider.ts | 27 +- src/exports/index.ts | 4 +- src/extension.ts | 10 +- src/integrations/diagnostics/index.ts | 4 +- .../editor/DecorationController.ts | 4 +- src/integrations/editor/DiffViewProvider.ts | 21 +- src/integrations/editor/detect-omission.ts | 6 +- src/integrations/misc/export-markdown.ts | 2 +- src/integrations/misc/open-file.ts | 5 +- src/integrations/misc/process-images.ts | 2 +- src/integrations/terminal/TerminalManager.ts | 2 +- src/integrations/terminal/TerminalProcess.ts | 6 +- .../theme/default-themes/dark_modern.json | 252 +++--- .../theme/default-themes/dark_plus.json | 382 ++++---- .../theme/default-themes/dark_vs.json | 781 ++++++++-------- .../theme/default-themes/hc_black.json | 23 +- .../theme/default-themes/hc_light.json | 16 +- .../theme/default-themes/light_modern.json | 286 +++--- .../theme/default-themes/light_plus.json | 384 ++++---- .../theme/default-themes/light_vs.json | 834 +++++++++--------- src/integrations/theme/getTheme.ts | 10 +- .../workspace/WorkspaceTracker.ts | 6 +- src/services/browser/BrowserSession.ts | 2 +- src/services/ripgrep/index.ts | 2 +- src/test/extension.test.ts | 18 +- src/utils/cost.ts | 2 +- webview-ui/package.json | 110 +-- webview-ui/public/index.html | 38 +- webview-ui/public/manifest.json | 46 +- .../src/components/chat/BrowserSessionRow.tsx | 12 +- webview-ui/src/components/chat/ChatRow.tsx | 8 +- .../src/components/chat/ChatTextArea.tsx | 22 +- webview-ui/src/components/chat/ChatView.tsx | 16 +- .../src/components/chat/ContextMenu.tsx | 2 +- .../src/components/common/CodeAccordian.tsx | 2 +- .../src/components/common/CodeBlock.tsx | 15 +- webview-ui/src/components/common/Demo.tsx | 41 +- .../src/components/common/MarkdownBlock.tsx | 15 +- .../src/components/history/HistoryView.tsx | 2 +- .../settings/OpenRouterModelPicker.tsx | 17 +- .../src/context/ExtensionStateContext.tsx | 2 +- webview-ui/src/index.tsx | 2 +- webview-ui/src/utils/context-mentions.ts | 4 +- webview-ui/src/utils/textMateToHljs.ts | 4 +- webview-ui/src/utils/validate.ts | 2 +- 65 files changed, 2101 insertions(+), 2091 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 9bf9d77..7e0c3bc 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -1,31 +1,25 @@ { - "root": true, - "parser": "@typescript-eslint/parser", - "parserOptions": { - "ecmaVersion": 6, - "sourceType": "module" - }, - "plugins": [ - "@typescript-eslint" - ], - "rules": { - "@typescript-eslint/naming-convention": [ - "warn", - { - "selector": "import", - "format": [ "camelCase", "PascalCase" ] - } - ], - "@typescript-eslint/semi": "off", - "curly": "warn", - "eqeqeq": "warn", - "no-throw-literal": "warn", - "semi": "off", - "react-hooks/exhaustive-deps": "off" - }, - "ignorePatterns": [ - "out", - "dist", - "**/*.d.ts" - ] -} \ No newline at end of file + "root": true, + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaVersion": 6, + "sourceType": "module" + }, + "plugins": ["@typescript-eslint"], + "rules": { + "@typescript-eslint/naming-convention": [ + "warn", + { + "selector": "import", + "format": ["camelCase", "PascalCase"] + } + ], + "@typescript-eslint/semi": "off", + "curly": "warn", + "eqeqeq": "warn", + "no-throw-literal": "warn", + "semi": "off", + "react-hooks/exhaustive-deps": "off" + }, + "ignorePatterns": ["out", "dist", "**/*.d.ts"] +} diff --git a/.prettierignore b/.prettierignore index ef91b87..71a9e12 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,4 +1,5 @@ dist/ node_modules webview-ui/build/ -CHANGELOG.md \ No newline at end of file +CHANGELOG.md +package-lock.json \ No newline at end of file diff --git a/.prettierrc.json b/.prettierrc.json index 6815451..cd43293 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -3,5 +3,5 @@ "useTabs": true, "printWidth": 120, "semi": false, - "jsxBracketSameLine": true -} \ No newline at end of file + "bracketSameLine": true +} diff --git a/.vscode-test.mjs b/.vscode-test.mjs index b62ba25..605b44f 100644 --- a/.vscode-test.mjs +++ b/.vscode-test.mjs @@ -1,5 +1,5 @@ -import { defineConfig } from '@vscode/test-cli'; +import { defineConfig } from "@vscode/test-cli" export default defineConfig({ - files: 'out/test/**/*.test.js', -}); + files: "out/test/**/*.test.js", +}) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d7a3ca1..5be3c32 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,5 +1,9 @@ { - // See http://go.microsoft.com/fwlink/?LinkId=827846 - // for the documentation about the extensions.json format - "recommendations": ["dbaeumer.vscode-eslint", "connor4312.esbuild-problem-matchers", "ms-vscode.extension-test-runner"] + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "dbaeumer.vscode-eslint", + "connor4312.esbuild-problem-matchers", + "ms-vscode.extension-test-runner" + ] } diff --git a/.vscode/launch.json b/.vscode/launch.json index c42edc0..9032340 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -9,12 +9,8 @@ "name": "Run Extension", "type": "extensionHost", "request": "launch", - "args": [ - "--extensionDevelopmentPath=${workspaceFolder}" - ], - "outFiles": [ - "${workspaceFolder}/dist/**/*.js" - ], + "args": ["--extensionDevelopmentPath=${workspaceFolder}"], + "outFiles": ["${workspaceFolder}/dist/**/*.js"], "preLaunchTask": "${defaultBuildTask}" } ] diff --git a/.vscode/settings.json b/.vscode/settings.json index 5c5ac48..16a5c02 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,13 +1,13 @@ // Place your settings in this file to overwrite default and user settings. { - "files.exclude": { - "out": false, // set this to true to hide the "out" folder with the compiled JS files - "dist": false // set this to true to hide the "dist" folder with the compiled JS files - }, - "search.exclude": { - "out": true, // set this to false to include "out" folder in search results - "dist": true // set this to false to include "dist" folder in search results - }, - // Turn off tsc task auto detection since we have the necessary tasks as npm scripts - "typescript.tsc.autoDetect": "off" -} \ No newline at end of file + "files.exclude": { + "out": false, // set this to true to hide the "out" folder with the compiled JS files + "dist": false // set this to true to hide the "dist" folder with the compiled JS files + }, + "search.exclude": { + "out": true, // set this to false to include "out" folder in search results + "dist": true // set this to false to include "dist" folder in search results + }, + // Turn off tsc task auto detection since we have the necessary tasks as npm scripts + "typescript.tsc.autoDetect": "off" +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index c82fb28..e141383 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,56 +4,52 @@ "version": "2.0.0", "tasks": [ { - "label": "watch", - "dependsOn": [ - "npm: build:webview", - "npm: watch:tsc", - "npm: watch:esbuild" - ], - "presentation": { - "reveal": "never" - }, - "group": { - "kind": "build", - "isDefault": true - } - }, - { - "type": "npm", - "script": "build:webview", - "group": "build", - "problemMatcher": [], - "isBackground": true, - "label": "npm: build:webview", - "presentation": { - "group": "watch", - "reveal": "never" - } - }, - { - "type": "npm", - "script": "watch:esbuild", - "group": "build", - "problemMatcher": "$esbuild-watch", - "isBackground": true, - "label": "npm: watch:esbuild", - "presentation": { - "group": "watch", - "reveal": "never" - } - }, + "label": "watch", + "dependsOn": ["npm: build:webview", "npm: watch:tsc", "npm: watch:esbuild"], + "presentation": { + "reveal": "never" + }, + "group": { + "kind": "build", + "isDefault": true + } + }, { - "type": "npm", - "script": "watch:tsc", - "group": "build", - "problemMatcher": "$tsc-watch", - "isBackground": true, - "label": "npm: watch:tsc", - "presentation": { - "group": "watch", - "reveal": "never" - } - }, + "type": "npm", + "script": "build:webview", + "group": "build", + "problemMatcher": [], + "isBackground": true, + "label": "npm: build:webview", + "presentation": { + "group": "watch", + "reveal": "never" + } + }, + { + "type": "npm", + "script": "watch:esbuild", + "group": "build", + "problemMatcher": "$esbuild-watch", + "isBackground": true, + "label": "npm: watch:esbuild", + "presentation": { + "group": "watch", + "reveal": "never" + } + }, + { + "type": "npm", + "script": "watch:tsc", + "group": "build", + "problemMatcher": "$tsc-watch", + "isBackground": true, + "label": "npm: watch:tsc", + "presentation": { + "group": "watch", + "reveal": "never" + } + }, { "type": "npm", "script": "watch-tests", @@ -67,10 +63,7 @@ }, { "label": "tasks: watch-tests", - "dependsOn": [ - "npm: watch", - "npm: watch-tests" - ], + "dependsOn": ["npm: watch", "npm: watch-tests"], "problemMatcher": [] } ] diff --git a/package-lock.json b/package-lock.json index 326dfc3..2b56f1b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -52,6 +52,7 @@ "esbuild": "^0.21.5", "eslint": "^8.57.0", "npm-run-all": "^4.1.5", + "prettier": "^3.3.3", "typescript": "^5.4.5" }, "engines": { @@ -9448,6 +9449,22 @@ "node": ">= 0.8.0" } }, + "node_modules/prettier": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz", + "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==", + "dev": true, + "license": "MIT", + "bin": { + "prettier": "bin/prettier.cjs" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/prettier/prettier?sponsor=1" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", diff --git a/package.json b/package.json index 8aadd1a..e17c4db 100644 --- a/package.json +++ b/package.json @@ -1,183 +1,186 @@ { - "name": "claude-dev", - "displayName": "Cline (prev. Claude Dev)", - "description": "Autonomous coding agent right in your IDE, capable of creating/editing files, running commands, using the browser, and more with your permission every step of the way.", - "version": "2.1.6", - "icon": "assets/icons/icon.png", - "galleryBanner": { - "color": "#617A91", - "theme": "dark" - }, - "engines": { - "vscode": "^1.84.0" - }, - "author": { - "name": "Cline Bot Inc." - }, - "license": "Apache-2.0", - "publisher": "saoudrizwan", - "repository": { - "type": "git", - "url": "https://github.com/cline/cline" - }, - "homepage": "https://cline.bot", - "categories": [ - "AI", - "Chat", - "Programming Languages", - "Education", - "Snippets", - "Testing" - ], - "keywords": [ - "cline", - "claude", - "dev", - "openrouter", - "coding", - "agent", - "autonomous", - "chatgpt", - "sonnet", - "ai", - "llama" - ], - "activationEvents": [], - "main": "./dist/extension.js", - "contributes": { - "viewsContainers": { - "activitybar": [ - { - "id": "claude-dev-ActivityBar", - "title": "Cline", - "icon": "$(robot)" - } - ] - }, - "views": { - "claude-dev-ActivityBar": [ - { - "type": "webview", - "id": "claude-dev.SidebarProvider", - "name": "" - } - ] - }, - "commands": [ - { - "command": "cline.plusButtonClicked", - "title": "New Task", - "icon": "$(add)" - }, - { - "command": "cline.historyButtonClicked", - "title": "History", - "icon": "$(history)" - }, - { - "command": "cline.popoutButtonClicked", - "title": "Open in Editor", - "icon": "$(link-external)" - }, - { - "command": "cline.settingsButtonClicked", - "title": "Settings", - "icon": "$(settings-gear)" - }, - { - "command": "cline.openInNewTab", - "title": "Open In New Tab", - "category": "Cline" - } - ], - "menus": { - "view/title": [ - { - "command": "cline.plusButtonClicked", - "group": "navigation@1", - "when": "view == claude-dev.SidebarProvider" - }, - { - "command": "cline.historyButtonClicked", - "group": "navigation@2", - "when": "view == claude-dev.SidebarProvider" - }, - { - "command": "cline.popoutButtonClicked", - "group": "navigation@3", - "when": "view == claude-dev.SidebarProvider" - }, - { - "command": "cline.settingsButtonClicked", - "group": "navigation@4", - "when": "view == claude-dev.SidebarProvider" - } - ] - } - }, - "scripts": { - "vscode:prepublish": "npm run package", - "compile": "npm run check-types && npm run lint && node esbuild.js", - "watch": "npm-run-all -p watch:*", - "watch:esbuild": "node esbuild.js --watch", - "watch:tsc": "tsc --noEmit --watch --project tsconfig.json", - "package": "npm run build:webview && npm run check-types && npm run lint && node esbuild.js --production", - "compile-tests": "tsc -p . --outDir out", - "watch-tests": "tsc -p . -w --outDir out", - "pretest": "npm run compile-tests && npm run compile && npm run lint", - "check-types": "tsc --noEmit", - "lint": "eslint src --ext ts", - "test": "vscode-test", - "install:all": "npm install && cd webview-ui && npm install", - "start:webview": "cd webview-ui && npm run start", - "build:webview": "cd webview-ui && npm run build", - "test:webview": "cd webview-ui && npm run test", - "publish:marketplace": "vsce publish && ovsx publish" - }, - "devDependencies": { - "@types/diff": "^5.2.1", - "@types/mocha": "^10.0.7", - "@types/node": "20.x", - "@types/vscode": "^1.84.0", - "@typescript-eslint/eslint-plugin": "^7.14.1", - "@typescript-eslint/parser": "^7.11.0", - "@vscode/test-cli": "^0.0.9", - "@vscode/test-electron": "^2.4.0", - "esbuild": "^0.21.5", - "eslint": "^8.57.0", - "npm-run-all": "^4.1.5", - "typescript": "^5.4.5" - }, - "dependencies": { - "@anthropic-ai/bedrock-sdk": "^0.10.2", - "@anthropic-ai/sdk": "^0.26.0", - "@anthropic-ai/vertex-sdk": "^0.4.1", - "@google/generative-ai": "^0.18.0", - "@types/clone-deep": "^4.0.4", - "@types/pdf-parse": "^1.1.4", - "@types/turndown": "^5.0.5", - "@vscode/codicons": "^0.0.36", - "axios": "^1.7.4", - "cheerio": "^1.0.0", - "clone-deep": "^4.0.1", - "default-shell": "^2.2.0", - "delay": "^6.0.0", - "diff": "^5.2.0", - "fast-deep-equal": "^3.1.3", - "globby": "^14.0.2", - "isbinaryfile": "^5.0.2", - "mammoth": "^1.8.0", - "monaco-vscode-textmate-theme-converter": "^0.1.7", - "openai": "^4.61.0", - "os-name": "^6.0.0", - "p-wait-for": "^5.0.2", - "pdf-parse": "^1.1.1", - "puppeteer-chromium-resolver": "^23.0.0", - "puppeteer-core": "^23.4.0", - "serialize-error": "^11.0.3", - "strip-ansi": "^7.1.0", - "tree-sitter-wasms": "^0.1.11", - "turndown": "^7.2.0", - "web-tree-sitter": "^0.22.6" - } + "name": "claude-dev", + "displayName": "Cline (prev. Claude Dev)", + "description": "Autonomous coding agent right in your IDE, capable of creating/editing files, running commands, using the browser, and more with your permission every step of the way.", + "version": "2.1.6", + "icon": "assets/icons/icon.png", + "galleryBanner": { + "color": "#617A91", + "theme": "dark" + }, + "engines": { + "vscode": "^1.84.0" + }, + "author": { + "name": "Cline Bot Inc." + }, + "license": "Apache-2.0", + "publisher": "saoudrizwan", + "repository": { + "type": "git", + "url": "https://github.com/cline/cline" + }, + "homepage": "https://cline.bot", + "categories": [ + "AI", + "Chat", + "Programming Languages", + "Education", + "Snippets", + "Testing" + ], + "keywords": [ + "cline", + "claude", + "dev", + "openrouter", + "coding", + "agent", + "autonomous", + "chatgpt", + "sonnet", + "ai", + "llama" + ], + "activationEvents": [], + "main": "./dist/extension.js", + "contributes": { + "viewsContainers": { + "activitybar": [ + { + "id": "claude-dev-ActivityBar", + "title": "Cline", + "icon": "$(robot)" + } + ] + }, + "views": { + "claude-dev-ActivityBar": [ + { + "type": "webview", + "id": "claude-dev.SidebarProvider", + "name": "" + } + ] + }, + "commands": [ + { + "command": "cline.plusButtonClicked", + "title": "New Task", + "icon": "$(add)" + }, + { + "command": "cline.historyButtonClicked", + "title": "History", + "icon": "$(history)" + }, + { + "command": "cline.popoutButtonClicked", + "title": "Open in Editor", + "icon": "$(link-external)" + }, + { + "command": "cline.settingsButtonClicked", + "title": "Settings", + "icon": "$(settings-gear)" + }, + { + "command": "cline.openInNewTab", + "title": "Open In New Tab", + "category": "Cline" + } + ], + "menus": { + "view/title": [ + { + "command": "cline.plusButtonClicked", + "group": "navigation@1", + "when": "view == claude-dev.SidebarProvider" + }, + { + "command": "cline.historyButtonClicked", + "group": "navigation@2", + "when": "view == claude-dev.SidebarProvider" + }, + { + "command": "cline.popoutButtonClicked", + "group": "navigation@3", + "when": "view == claude-dev.SidebarProvider" + }, + { + "command": "cline.settingsButtonClicked", + "group": "navigation@4", + "when": "view == claude-dev.SidebarProvider" + } + ] + } + }, + "scripts": { + "vscode:prepublish": "npm run package", + "compile": "npm run check-types && npm run lint && node esbuild.js", + "watch": "npm-run-all -p watch:*", + "watch:esbuild": "node esbuild.js --watch", + "watch:tsc": "tsc --noEmit --watch --project tsconfig.json", + "package": "npm run build:webview && npm run check-types && npm run lint && node esbuild.js --production", + "compile-tests": "tsc -p . --outDir out", + "watch-tests": "tsc -p . -w --outDir out", + "pretest": "npm run compile-tests && npm run compile && npm run lint", + "check-types": "tsc --noEmit", + "lint": "eslint src --ext ts", + "format": "prettier . --check", + "format:fix": "prettier . --write", + "test": "vscode-test", + "install:all": "npm install && cd webview-ui && npm install", + "start:webview": "cd webview-ui && npm run start", + "build:webview": "cd webview-ui && npm run build", + "test:webview": "cd webview-ui && npm run test", + "publish:marketplace": "vsce publish && ovsx publish" + }, + "devDependencies": { + "@types/diff": "^5.2.1", + "@types/mocha": "^10.0.7", + "@types/node": "20.x", + "@types/vscode": "^1.84.0", + "@typescript-eslint/eslint-plugin": "^7.14.1", + "@typescript-eslint/parser": "^7.11.0", + "@vscode/test-cli": "^0.0.9", + "@vscode/test-electron": "^2.4.0", + "esbuild": "^0.21.5", + "eslint": "^8.57.0", + "npm-run-all": "^4.1.5", + "prettier": "^3.3.3", + "typescript": "^5.4.5" + }, + "dependencies": { + "@anthropic-ai/bedrock-sdk": "^0.10.2", + "@anthropic-ai/sdk": "^0.26.0", + "@anthropic-ai/vertex-sdk": "^0.4.1", + "@google/generative-ai": "^0.18.0", + "@types/clone-deep": "^4.0.4", + "@types/pdf-parse": "^1.1.4", + "@types/turndown": "^5.0.5", + "@vscode/codicons": "^0.0.36", + "axios": "^1.7.4", + "cheerio": "^1.0.0", + "clone-deep": "^4.0.1", + "default-shell": "^2.2.0", + "delay": "^6.0.0", + "diff": "^5.2.0", + "fast-deep-equal": "^3.1.3", + "globby": "^14.0.2", + "isbinaryfile": "^5.0.2", + "mammoth": "^1.8.0", + "monaco-vscode-textmate-theme-converter": "^0.1.7", + "openai": "^4.61.0", + "os-name": "^6.0.0", + "p-wait-for": "^5.0.2", + "pdf-parse": "^1.1.1", + "puppeteer-chromium-resolver": "^23.0.0", + "puppeteer-core": "^23.4.0", + "serialize-error": "^11.0.3", + "strip-ansi": "^7.1.0", + "tree-sitter-wasms": "^0.1.11", + "turndown": "^7.2.0", + "web-tree-sitter": "^0.22.6" + } } diff --git a/src/api/providers/anthropic.ts b/src/api/providers/anthropic.ts index 5014ec8..c090f17 100644 --- a/src/api/providers/anthropic.ts +++ b/src/api/providers/anthropic.ts @@ -36,7 +36,7 @@ export class AnthropicHandler implements ApiHandler { */ const userMsgIndices = messages.reduce( (acc, msg, index) => (msg.role === "user" ? [...acc, index] : acc), - [] as number[] + [] as number[], ) const lastUserMsgIndex = userMsgIndices[userMsgIndices.length - 1] ?? -1 const secondLastMsgUserIndex = userMsgIndices[userMsgIndices.length - 2] ?? -1 @@ -58,12 +58,12 @@ export class AnthropicHandler implements ApiHandler { text: message.content, cache_control: { type: "ephemeral" }, }, - ] + ] : message.content.map((content, contentIndex) => contentIndex === message.content.length - 1 ? { ...content, cache_control: { type: "ephemeral" } } - : content - ), + : content, + ), } } return message @@ -88,7 +88,7 @@ export class AnthropicHandler implements ApiHandler { default: return undefined } - })() + })(), ) break } diff --git a/src/api/providers/lmstudio.ts b/src/api/providers/lmstudio.ts index 1c085f7..868ef7d 100644 --- a/src/api/providers/lmstudio.ts +++ b/src/api/providers/lmstudio.ts @@ -42,7 +42,7 @@ export class LmStudioHandler implements ApiHandler { } catch (error) { // LM Studio doesn't return an error code/body for now throw new Error( - "Please check the LM Studio developer logs to debug what went wrong. You may need to load the model with a larger context length to work with Cline's prompts." + "Please check the LM Studio developer logs to debug what went wrong. You may need to load the model with a larger context length to work with Cline's prompts.", ) } } diff --git a/src/api/transform/gemini-format.ts b/src/api/transform/gemini-format.ts index f300a07..935e471 100644 --- a/src/api/transform/gemini-format.ts +++ b/src/api/transform/gemini-format.ts @@ -19,7 +19,7 @@ export function convertAnthropicContentToGemini( | Anthropic.Messages.ImageBlockParam | Anthropic.Messages.ToolUseBlockParam | Anthropic.Messages.ToolResultBlockParam - > + >, ): Part[] { if (typeof content === "string") { return [{ text: content } as TextPart] @@ -83,7 +83,7 @@ export function convertAnthropicContentToGemini( data: part.source.data, mimeType: part.source.media_type, }, - } as InlineDataPart) + }) as InlineDataPart, ), ] } @@ -113,7 +113,7 @@ export function convertAnthropicToolToGemini(tool: Anthropic.Messages.Tool): Fun type: (value as any).type.toUpperCase(), description: (value as any).description || "", }, - ]) + ]), ), required: (tool.input_schema.required as string[]) || [], }, @@ -133,7 +133,7 @@ export function unescapeGeminiContent(content: string) { } export function convertGeminiResponseToAnthropic( - response: EnhancedGenerateContentResponse + response: EnhancedGenerateContentResponse, ): Anthropic.Messages.Message { const content: Anthropic.Messages.ContentBlock[] = [] diff --git a/src/api/transform/o1-format.ts b/src/api/transform/o1-format.ts index f5d6a93..1346fdb 100644 --- a/src/api/transform/o1-format.ts +++ b/src/api/transform/o1-format.ts @@ -167,7 +167,7 @@ I've analyzed the project structure, but I need more information to proceed. Let export function convertToO1Messages( openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[], - systemPrompt: string + systemPrompt: string, ): OpenAI.Chat.ChatCompletionMessageParam[] { const toolsReplaced = openAiMessages.reduce((acc, message) => { if (message.role === "tool") { @@ -360,7 +360,7 @@ function validateToolInput(toolName: string, tool_input: Record) // Convert OpenAI response to Anthropic format export function convertO1ResponseToAnthropicMessage( - completion: OpenAI.Chat.Completions.ChatCompletion + completion: OpenAI.Chat.Completions.ChatCompletion, ): Anthropic.Messages.Message { const openAiMessage = completion.choices[0].message const { normalText, toolCalls } = parseAIResponse(openAiMessage.content || "") @@ -405,7 +405,7 @@ export function convertO1ResponseToAnthropicMessage( name: toolCall.tool, input: toolCall.tool_input, } - }) + }), ) } diff --git a/src/api/transform/openai-format.ts b/src/api/transform/openai-format.ts index 499e30a..fe23b9b 100644 --- a/src/api/transform/openai-format.ts +++ b/src/api/transform/openai-format.ts @@ -2,7 +2,7 @@ import { Anthropic } from "@anthropic-ai/sdk" import OpenAI from "openai" export function convertToOpenAiMessages( - anthropicMessages: Anthropic.Messages.MessageParam[] + anthropicMessages: Anthropic.Messages.MessageParam[], ): OpenAI.Chat.ChatCompletionMessageParam[] { const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [] @@ -31,7 +31,7 @@ export function convertToOpenAiMessages( } // user cannot send tool_use messages return acc }, - { nonToolMessages: [], toolMessages: [] } + { nonToolMessages: [], toolMessages: [] }, ) // Process tool result messages FIRST since they must follow the tool use messages @@ -105,7 +105,7 @@ export function convertToOpenAiMessages( } // assistant cannot send tool_result messages return acc }, - { nonToolMessages: [], toolMessages: [] } + { nonToolMessages: [], toolMessages: [] }, ) // Process non-tool messages @@ -147,7 +147,7 @@ export function convertToOpenAiMessages( // Convert OpenAI response to Anthropic format export function convertToAnthropicMessage( - completion: OpenAI.Chat.Completions.ChatCompletion + completion: OpenAI.Chat.Completions.ChatCompletion, ): Anthropic.Messages.Message { const openAiMessage = completion.choices[0].message const anthropicMessage: Anthropic.Messages.Message = { @@ -196,7 +196,7 @@ export function convertToAnthropicMessage( name: toolCall.function.name, input: parsedInput, } - }) + }), ) } return anthropicMessage diff --git a/src/core/Cline.ts b/src/core/Cline.ts index a587dd9..229d950 100644 --- a/src/core/Cline.ts +++ b/src/core/Cline.ts @@ -96,7 +96,7 @@ export class Cline { alwaysAllowReadOnly?: boolean, task?: string, images?: string[], - historyItem?: HistoryItem + historyItem?: HistoryItem, ) { this.providerRef = new WeakRef(provider) this.api = buildApiHandler(apiConfiguration) @@ -196,7 +196,7 @@ export class Cline { this.clineMessages[ findLastIndex( this.clineMessages, - (m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task") + (m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task"), ) ] await this.providerRef.deref()?.updateTaskHistory({ @@ -220,7 +220,7 @@ export class Cline { async ask( type: ClineAsk, text?: string, - partial?: boolean + partial?: boolean, ): Promise<{ response: ClineAskResponse; text?: string; images?: string[] }> { // If this Cline instance was aborted by the provider, then the only thing keeping us alive is a promise still running in the background, in which case we don't want to send its result to the webview as it is attached to a new instance of Cline now. So we can safely ignore the result of any active promises, and this class will be deallocated. (Although we set Cline = undefined in provider, that simply removes the reference to this instance, but the instance is still alive until this promise resolves or rejects.) if (this.abort) { @@ -381,7 +381,7 @@ export class Cline { "error", `Cline tried to use ${toolName}${ relPath ? ` for '${relPath.toPosix()}'` : "" - } without value for required parameter '${paramName}'. Retrying...` + } without value for required parameter '${paramName}'. Retrying...`, ) return formatResponse.toolError(formatResponse.missingToolParameterError(paramName)) } @@ -413,7 +413,7 @@ export class Cline { // Remove any resume messages that may have been added before const lastRelevantMessageIndex = findLastIndex( modifiedClineMessages, - (m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task") + (m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task"), ) if (lastRelevantMessageIndex !== -1) { modifiedClineMessages.splice(lastRelevantMessageIndex + 1) @@ -422,7 +422,7 @@ export class Cline { // since we don't use api_req_finished anymore, we need to check if the last api_req_started has a cost value, if it doesn't and no cancellation reason to present, then we remove it since it indicates an api request without any partial content streamed const lastApiReqStartedIndex = findLastIndex( modifiedClineMessages, - (m) => m.type === "say" && m.say === "api_req_started" + (m) => m.type === "say" && m.say === "api_req_started", ) if (lastApiReqStartedIndex !== -1) { const lastApiReqStarted = modifiedClineMessages[lastApiReqStartedIndex] @@ -527,7 +527,7 @@ export class Cline { if (hasToolUse) { const toolUseBlocks = content.filter( - (block) => block.type === "tool_use" + (block) => block.type === "tool_use", ) as Anthropic.Messages.ToolUseBlock[] const toolResponses: Anthropic.ToolResultBlockParam[] = toolUseBlocks.map((block) => ({ type: "tool_result", @@ -553,17 +553,17 @@ export class Cline { : [{ type: "text", text: previousAssistantMessage.content }] const toolUseBlocks = assistantContent.filter( - (block) => block.type === "tool_use" + (block) => block.type === "tool_use", ) as Anthropic.Messages.ToolUseBlock[] if (toolUseBlocks.length > 0) { const existingToolResults = existingUserContent.filter( - (block) => block.type === "tool_result" + (block) => block.type === "tool_result", ) as Anthropic.ToolResultBlockParam[] const missingToolResponses: Anthropic.ToolResultBlockParam[] = toolUseBlocks .filter( - (toolUse) => !existingToolResults.some((result) => result.tool_use_id === toolUse.id) + (toolUse) => !existingToolResults.some((result) => result.tool_use_id === toolUse.id), ) .map((toolUse) => ({ type: "tool_result", @@ -733,7 +733,7 @@ export class Cline { `Command is still running in the user's terminal.${ result.length > 0 ? `\nHere's the output so far:\n${result}` : "" }\n\nThe user provided the following feedback:\n\n${userFeedback.text}\n`, - userFeedback.images + userFeedback.images, ), ] } @@ -762,7 +762,7 @@ export class Cline { const previousRequest = this.clineMessages[previousApiReqIndex] if (previousRequest && previousRequest.text) { const { tokensIn, tokensOut, cacheWrites, cacheReads }: ClineApiReqInfo = JSON.parse( - previousRequest.text + previousRequest.text, ) const totalTokens = (tokensIn || 0) + (tokensOut || 0) + (cacheWrites || 0) + (cacheReads || 0) const contextWindow = this.api.getModel().info.contextWindow || 128_000 @@ -785,7 +785,7 @@ export class Cline { // note that this api_req_failed ask is unique in that we only present this option if the api hasn't streamed any content yet (ie it fails on the first chunk due), as it would allow them to hit a retry button. However if the api failed mid-stream, it could be in any arbitrary state where some tools may have executed, so that error is handled differently and requires cancelling the task entirely. const { response } = await this.ask( "api_req_failed", - error.message ?? JSON.stringify(serializeError(error), null, 2) + error.message ?? JSON.stringify(serializeError(error), null, 2), ) if (response !== "yesButtonClicked") { // this will never happen since if noButtonClicked, we will clear current task, aborting this instance @@ -948,7 +948,7 @@ export class Cline { if (response === "messageResponse") { await this.say("user_feedback", text, images) pushToolResult( - formatResponse.toolResult(formatResponse.toolDeniedWithFeedback(text), images) + formatResponse.toolResult(formatResponse.toolDeniedWithFeedback(text), images), ) // this.userMessageContent.push({ // type: "text", @@ -981,7 +981,7 @@ export class Cline { const errorString = `Error ${action}: ${JSON.stringify(serializeError(error))}` await this.say( "error", - `Error ${action}:\n${error.message ?? JSON.stringify(serializeError(error), null, 2)}` + `Error ${action}:\n${error.message ?? JSON.stringify(serializeError(error), null, 2)}`, ) // this.toolResults.push({ // type: "tool_result", @@ -1007,7 +1007,7 @@ export class Cline { .split("") .map((char) => `(?:${char})?`) .join("")}$`, - "g" + "g", ) return text.replace(tagRegex, "") } @@ -1111,8 +1111,8 @@ export class Cline { ? formatResponse.createPrettyPatch( relPath, this.diffViewProvider.originalContent, - newContent - ) + newContent, + ) : undefined, } satisfies ClineSayTool) const didApprove = await askApproval("tool", completeMessage) @@ -1130,7 +1130,7 @@ export class Cline { tool: fileExists ? "editedExistingFile" : "newFileCreated", path: getReadablePath(cwd, relPath), diff: userEdits, - } satisfies ClineSayTool) + } satisfies ClineSayTool), ) pushToolResult( `The user made the following updates to your content:\n\n${userEdits}\n\n` + @@ -1140,11 +1140,11 @@ export class Cline { `1. You do not need to re-write the file with these changes, as they have already been applied.\n` + `2. Proceed with the task using this updated file content as the new baseline.\n` + `3. If the user's edits have addressed part of the task or changed the requirements, adjust your approach accordingly.` + - `${newProblemsMessage}` + `${newProblemsMessage}`, ) } else { pushToolResult( - `The content was successfully saved to ${relPath.toPosix()}.${newProblemsMessage}` + `The content was successfully saved to ${relPath.toPosix()}.${newProblemsMessage}`, ) } await this.diffViewProvider.reset() @@ -1276,7 +1276,7 @@ export class Cline { if (!relDirPath) { this.consecutiveMistakeCount++ pushToolResult( - await this.sayAndCreateMissingParamError("list_code_definition_names", "path") + await this.sayAndCreateMissingParamError("list_code_definition_names", "path"), ) break } @@ -1381,7 +1381,7 @@ export class Cline { await this.ask( "browser_action_launch", removeClosingTag("url", url), - block.partial + block.partial, ).catch(() => {}) } else { await this.say( @@ -1392,7 +1392,7 @@ export class Cline { text: removeClosingTag("text", text), } satisfies ClineSayBrowserAction), undefined, - block.partial + block.partial, ) } break @@ -1402,7 +1402,7 @@ export class Cline { if (!url) { this.consecutiveMistakeCount++ pushToolResult( - await this.sayAndCreateMissingParamError("browser_action", "url") + await this.sayAndCreateMissingParamError("browser_action", "url"), ) await this.browserSession.closeBrowser() break @@ -1424,7 +1424,10 @@ export class Cline { if (!coordinate) { this.consecutiveMistakeCount++ pushToolResult( - await this.sayAndCreateMissingParamError("browser_action", "coordinate") + await this.sayAndCreateMissingParamError( + "browser_action", + "coordinate", + ), ) await this.browserSession.closeBrowser() break // can't be within an inner switch @@ -1434,7 +1437,7 @@ export class Cline { if (!text) { this.consecutiveMistakeCount++ pushToolResult( - await this.sayAndCreateMissingParamError("browser_action", "text") + await this.sayAndCreateMissingParamError("browser_action", "text"), ) await this.browserSession.closeBrowser() break @@ -1449,7 +1452,7 @@ export class Cline { text, } satisfies ClineSayBrowserAction), undefined, - false + false, ) switch (action) { case "click": @@ -1482,15 +1485,15 @@ export class Cline { `The browser action has been executed. The console logs and screenshot have been captured for your analysis.\n\nConsole logs:\n${ browserActionResult.logs || "(No new logs)" }\n\n(REMEMBER: if you need to proceed to using non-\`browser_action\` tools or launch a new browser, you MUST first close this browser. For example, if after analyzing the logs and screenshot you need to edit a file, you must first close the browser before you can use the write_to_file tool.)`, - browserActionResult.screenshot ? [browserActionResult.screenshot] : [] - ) + browserActionResult.screenshot ? [browserActionResult.screenshot] : [], + ), ) break case "close": pushToolResult( formatResponse.toolResult( - `The browser has been closed. You may now proceed to using other tools.` - ) + `The browser has been closed. You may now proceed to using other tools.`, + ), ) break } @@ -1507,14 +1510,14 @@ export class Cline { try { if (block.partial) { await this.ask("command", removeClosingTag("command", command), block.partial).catch( - () => {} + () => {}, ) break } else { if (!command) { this.consecutiveMistakeCount++ pushToolResult( - await this.sayAndCreateMissingParamError("execute_command", "command") + await this.sayAndCreateMissingParamError("execute_command", "command"), ) break } @@ -1541,14 +1544,14 @@ export class Cline { try { if (block.partial) { await this.ask("followup", removeClosingTag("question", question), block.partial).catch( - () => {} + () => {}, ) break } else { if (!question) { this.consecutiveMistakeCount++ pushToolResult( - await this.sayAndCreateMissingParamError("ask_followup_question", "question") + await this.sayAndCreateMissingParamError("ask_followup_question", "question"), ) break } @@ -1599,7 +1602,7 @@ export class Cline { await this.ask( "command", removeClosingTag("command", command), - block.partial + block.partial, ).catch(() => {}) } else { // last message is completion_result @@ -1608,12 +1611,12 @@ export class Cline { "completion_result", removeClosingTag("result", result), undefined, - false + false, ) await this.ask( "command", removeClosingTag("command", command), - block.partial + block.partial, ).catch(() => {}) } } else { @@ -1622,7 +1625,7 @@ export class Cline { "completion_result", removeClosingTag("result", result), undefined, - block.partial + block.partial, ) } break @@ -1630,7 +1633,7 @@ export class Cline { if (!result) { this.consecutiveMistakeCount++ pushToolResult( - await this.sayAndCreateMissingParamError("attempt_completion", "result") + await this.sayAndCreateMissingParamError("attempt_completion", "result"), ) break } @@ -1731,7 +1734,7 @@ export class Cline { async recursivelyMakeClineRequests( userContent: UserContent, - includeFileDetails: boolean = false + includeFileDetails: boolean = false, ): Promise { if (this.abort) { throw new Error("Cline instance aborted") @@ -1742,7 +1745,7 @@ export class Cline { "mistake_limit_reached", this.api.getModel().id.includes("claude") ? `This may indicate a failure in his thought process or inability to use a tool properly, which can be mitigated with some user guidance (e.g. "Try breaking down the task into smaller steps").` - : "Cline uses complex prompts and iterative task execution that may be challenging for less capable models. For best results, it's recommended to use Claude 3.5 Sonnet for its advanced agentic coding capabilities." + : "Cline uses complex prompts and iterative task execution that may be challenging for less capable models. For best results, it's recommended to use Claude 3.5 Sonnet for its advanced agentic coding capabilities.", ) if (response === "messageResponse") { userContent.push( @@ -1752,7 +1755,7 @@ export class Cline { text: formatResponse.tooManyMistakes(text), } as Anthropic.Messages.TextBlockParam, ...formatResponse.imageBlocks(images), - ] + ], ) } this.consecutiveMistakeCount = 0 @@ -1768,7 +1771,7 @@ export class Cline { JSON.stringify({ request: userContent.map((block) => formatContentBlockToMarkdown(block)).join("\n\n") + "\n\nLoading...", - }) + }), ) const [parsedUserContent, environmentDetails] = await this.loadContext(userContent, includeFileDetails) @@ -1810,7 +1813,7 @@ export class Cline { inputTokens, outputTokens, cacheWriteTokens, - cacheReadTokens + cacheReadTokens, ), cancelReason, streamingFailedMessage, @@ -1924,7 +1927,7 @@ export class Cline { this.abortTask() // if the stream failed, there's various states the task could be in (i.e. could have streamed some tools the user may have executed), so we just resort to replicating a cancel task await abortStream( "streaming_failed", - error.message ?? JSON.stringify(serializeError(error), null, 2) + error.message ?? JSON.stringify(serializeError(error), null, 2), ) const history = await this.providerRef.deref()?.getTaskWithId(this.taskId) if (history) { @@ -1991,7 +1994,7 @@ export class Cline { // if there's no assistant_responses, that means we got no text or tool_use content blocks from API which we should assume is an error await this.say( "error", - "Unexpected API Response: The language model did not provide any assistant messages. This may indicate an issue with the API or the model's output." + "Unexpected API Response: The language model did not provide any assistant messages. This may indicate an issue with the API or the model's output.", ) await this.addToApiConversationHistory({ role: "assistant", @@ -2037,7 +2040,7 @@ export class Cline { } } return contentBlock - }) + }), ) return { ...block, @@ -2046,7 +2049,7 @@ export class Cline { } } return block - }) + }), ), this.getEnvironmentDetails(includeFileDetails), ]) diff --git a/src/core/mentions/index.ts b/src/core/mentions/index.ts index 629030a..1c9c122 100644 --- a/src/core/mentions/index.ts +++ b/src/core/mentions/index.ts @@ -150,7 +150,7 @@ async function getFileOrFolderContent(mentionPath: string, cwd: string): Promise } catch (error) { return undefined } - })() + })(), ) } else if (entry.isDirectory()) { folderContent += `${linePrefix}${entry.name}/\n` @@ -174,7 +174,7 @@ function getWorkspaceProblems(cwd: string): string { const result = diagnosticsToProblemsString( diagnostics, [vscode.DiagnosticSeverity.Error, vscode.DiagnosticSeverity.Warning], - cwd + cwd, ) if (!result) { return "No errors or warnings detected." diff --git a/src/core/prompts/responses.ts b/src/core/prompts/responses.ts index 543a6f3..7ed45d7 100644 --- a/src/core/prompts/responses.ts +++ b/src/core/prompts/responses.ts @@ -30,7 +30,7 @@ Otherwise, if you have not completed the task and do not need additional informa toolResult: ( text: string, - images?: string[] + images?: string[], ): string | Array => { if (images && images.length > 0) { const textBlock: Anthropic.TextBlockParam = { type: "text", text } @@ -76,7 +76,7 @@ Otherwise, if you have not completed the task and do not need additional informa }) if (didHitLimit) { return `${sorted.join( - "\n" + "\n", )}\n\n(File list truncated. Use list_files on specific subdirectories if you need to explore further.)` } else if (sorted.length === 0 || (sorted.length === 1 && sorted[0] === "")) { return "No files found." @@ -105,7 +105,7 @@ const formatImagesIntoBlocks = (images?: string[]): Anthropic.ImageBlockParam[] type: "image", source: { type: "base64", media_type: mimeType, data: base64 }, } as Anthropic.ImageBlockParam - }) + }) : [] } diff --git a/src/core/prompts/system.ts b/src/core/prompts/system.ts index 763788e..ae29462 100644 --- a/src/core/prompts/system.ts +++ b/src/core/prompts/system.ts @@ -4,7 +4,7 @@ import os from "os" export const SYSTEM_PROMPT = async ( cwd: string, - supportsComputerUse: boolean + supportsComputerUse: boolean, ) => `You are Cline, a highly skilled software engineer with extensive knowledge in many programming languages, frameworks, design patterns, and best practices. ==== diff --git a/src/core/sliding-window/index.ts b/src/core/sliding-window/index.ts index 08814b3..caa604b 100644 --- a/src/core/sliding-window/index.ts +++ b/src/core/sliding-window/index.ts @@ -9,7 +9,7 @@ Therefore, this function should only be called when absolutely necessary to fit context limits, not as a continuous process. */ export function truncateHalfConversation( - messages: Anthropic.Messages.MessageParam[] + messages: Anthropic.Messages.MessageParam[], ): Anthropic.Messages.MessageParam[] { // API expects messages to be in user-assistant order, and tool use messages must be followed by tool results. We need to maintain this structure while truncating. diff --git a/src/core/webview/ClineProvider.ts b/src/core/webview/ClineProvider.ts index 2642d10..619298e 100644 --- a/src/core/webview/ClineProvider.ts +++ b/src/core/webview/ClineProvider.ts @@ -74,7 +74,10 @@ export class ClineProvider implements vscode.WebviewViewProvider { private workspaceTracker?: WorkspaceTracker private latestAnnouncementId = "oct-28-2024" // update to some unique identifier when we add a new announcement - constructor(readonly context: vscode.ExtensionContext, private readonly outputChannel: vscode.OutputChannel) { + constructor( + readonly context: vscode.ExtensionContext, + private readonly outputChannel: vscode.OutputChannel, + ) { this.outputChannel.appendLine("ClineProvider instantiated") ClineProvider.activeInstances.add(this) this.workspaceTracker = new WorkspaceTracker(this) @@ -110,7 +113,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { } resolveWebviewView( - webviewView: vscode.WebviewView | vscode.WebviewPanel + webviewView: vscode.WebviewView | vscode.WebviewPanel, //context: vscode.WebviewViewResolveContext, used to recreate a deallocated webview, but we don't need this since we use retainContextWhenHidden //token: vscode.CancellationToken ): void | Thenable { @@ -143,7 +146,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { } }, null, - this.disposables + this.disposables, ) } else if ("onDidChangeVisibility" in webviewView) { // sidebar @@ -154,7 +157,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { } }, null, - this.disposables + this.disposables, ) } @@ -165,7 +168,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { await this.dispose() }, null, - this.disposables + this.disposables, ) // Listen for when color changes @@ -177,7 +180,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { } }, null, - this.disposables + this.disposables, ) // if the extension is starting a new session, clear previous task state @@ -202,7 +205,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { alwaysAllowReadOnly, undefined, undefined, - historyItem + historyItem, ) } @@ -306,7 +309,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { this.postStateToWebview() this.workspaceTracker?.initializeFilePaths() // don't await getTheme().then((theme) => - this.postMessageToWebview({ type: "theme", text: JSON.stringify(theme) }) + this.postMessageToWebview({ type: "theme", text: JSON.stringify(theme) }), ) // post last cached models in case the call to endpoint fails this.readOpenRouterModels().then((openRouterModels) => { @@ -324,7 +327,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { if (apiConfiguration.openRouterModelId) { await this.updateGlobalState( "openRouterModelInfo", - openRouterModels[apiConfiguration.openRouterModelId] + openRouterModels[apiConfiguration.openRouterModelId], ) await this.postStateToWebview() } @@ -487,7 +490,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { } }, null, - this.disposables + this.disposables, ) } @@ -573,7 +576,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { async readOpenRouterModels(): Promise | undefined> { const openRouterModelsFilePath = path.join( await this.ensureCacheDirectoryExists(), - GlobalFileNames.openRouterModels + GlobalFileNames.openRouterModels, ) const fileExists = await fileExistsAtPath(openRouterModelsFilePath) if (fileExists) { @@ -586,7 +589,7 @@ export class ClineProvider implements vscode.WebviewViewProvider { async refreshOpenRouterModels() { const openRouterModelsFilePath = path.join( await this.ensureCacheDirectoryExists(), - GlobalFileNames.openRouterModels + GlobalFileNames.openRouterModels, ) let models: Record = {} diff --git a/src/exports/index.ts b/src/exports/index.ts index ebb42d0..04d26d8 100644 --- a/src/exports/index.ts +++ b/src/exports/index.ts @@ -25,13 +25,13 @@ export function createClineAPI(outputChannel: vscode.OutputChannel, sidebarProvi images: images, }) outputChannel.appendLine( - `Task started with message: ${task ? `"${task}"` : "undefined"} and ${images?.length || 0} image(s)` + `Task started with message: ${task ? `"${task}"` : "undefined"} and ${images?.length || 0} image(s)`, ) }, sendMessage: async (message?: string, images?: string[]) => { outputChannel.appendLine( - `Sending message: ${message ? `"${message}"` : "undefined"} with ${images?.length || 0} image(s)` + `Sending message: ${message ? `"${message}"` : "undefined"} with ${images?.length || 0} image(s)`, ) await sidebarProvider.postMessageToWebview({ type: "invoke", diff --git a/src/extension.ts b/src/extension.ts index e72c4ce..6a3dad3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -31,7 +31,7 @@ export function activate(context: vscode.ExtensionContext) { context.subscriptions.push( vscode.window.registerWebviewViewProvider(ClineProvider.sideBarId, sidebarProvider, { webviewOptions: { retainContextWhenHidden: true }, - }) + }), ) context.subscriptions.push( @@ -40,7 +40,7 @@ export function activate(context: vscode.ExtensionContext) { await sidebarProvider.clearTask() await sidebarProvider.postStateToWebview() await sidebarProvider.postMessageToWebview({ type: "action", action: "chatButtonClicked" }) - }) + }), ) const openClineInNewTab = async () => { @@ -83,13 +83,13 @@ export function activate(context: vscode.ExtensionContext) { vscode.commands.registerCommand("cline.settingsButtonClicked", () => { //vscode.window.showInformationMessage(message) sidebarProvider.postMessageToWebview({ type: "action", action: "settingsButtonClicked" }) - }) + }), ) context.subscriptions.push( vscode.commands.registerCommand("cline.historyButtonClicked", () => { sidebarProvider.postMessageToWebview({ type: "action", action: "historyButtonClicked" }) - }) + }), ) /* @@ -105,7 +105,7 @@ export function activate(context: vscode.ExtensionContext) { } })() context.subscriptions.push( - vscode.workspace.registerTextDocumentContentProvider(DIFF_VIEW_URI_SCHEME, diffContentProvider) + vscode.workspace.registerTextDocumentContentProvider(DIFF_VIEW_URI_SCHEME, diffContentProvider), ) // URI Handler diff --git a/src/integrations/diagnostics/index.ts b/src/integrations/diagnostics/index.ts index 26b4f07..ad4ee77 100644 --- a/src/integrations/diagnostics/index.ts +++ b/src/integrations/diagnostics/index.ts @@ -4,7 +4,7 @@ import deepEqual from "fast-deep-equal" export function getNewDiagnostics( oldDiagnostics: [vscode.Uri, vscode.Diagnostic[]][], - newDiagnostics: [vscode.Uri, vscode.Diagnostic[]][] + newDiagnostics: [vscode.Uri, vscode.Diagnostic[]][], ): [vscode.Uri, vscode.Diagnostic[]][] { const newProblems: [vscode.Uri, vscode.Diagnostic[]][] = [] const oldMap = new Map(oldDiagnostics) @@ -73,7 +73,7 @@ export function getNewDiagnostics( export function diagnosticsToProblemsString( diagnostics: [vscode.Uri, vscode.Diagnostic[]][], severities: vscode.DiagnosticSeverity[], - cwd: string + cwd: string, ): string { let result = "" for (const [uri, fileDiagnostics] of diagnostics) { diff --git a/src/integrations/editor/DecorationController.ts b/src/integrations/editor/DecorationController.ts index c1b6458..8f47540 100644 --- a/src/integrations/editor/DecorationController.ts +++ b/src/integrations/editor/DecorationController.ts @@ -65,8 +65,8 @@ export class DecorationController { this.ranges.push( new vscode.Range( new vscode.Position(line + 1, 0), - new vscode.Position(totalLines - 1, Number.MAX_SAFE_INTEGER) - ) + new vscode.Position(totalLines - 1, Number.MAX_SAFE_INTEGER), + ), ) } diff --git a/src/integrations/editor/DiffViewProvider.ts b/src/integrations/editor/DiffViewProvider.ts index c59d26e..c4dced0 100644 --- a/src/integrations/editor/DiffViewProvider.ts +++ b/src/integrations/editor/DiffViewProvider.ts @@ -34,7 +34,7 @@ export class DiffViewProvider { // if the file is already open, ensure it's not dirty before getting its contents if (fileExists) { const existingDocument = vscode.workspace.textDocuments.find((doc) => - arePathsEqual(doc.uri.fsPath, absolutePath) + arePathsEqual(doc.uri.fsPath, absolutePath), ) if (existingDocument && existingDocument.isDirty) { await existingDocument.save() @@ -62,7 +62,7 @@ export class DiffViewProvider { .map((tg) => tg.tabs) .flat() .filter( - (tab) => tab.input instanceof vscode.TabInputText && arePathsEqual(tab.input.uri.fsPath, absolutePath) + (tab) => tab.input instanceof vscode.TabInputText && arePathsEqual(tab.input.uri.fsPath, absolutePath), ) for (const tab of tabs) { if (!tab.isDirty) { @@ -179,7 +179,7 @@ export class DiffViewProvider { [ vscode.DiagnosticSeverity.Error, // only including errors since warnings can be distracting (if user wants to fix warnings they can use the @problems mention) ], - this.cwd + this.cwd, ) // will be empty string if no errors const newProblemsMessage = newProblems.length > 0 ? `\n\nNew problems detected after saving the file:\n${newProblems}` : "" @@ -194,7 +194,7 @@ export class DiffViewProvider { const userEdits = formatResponse.createPrettyPatch( this.relPath.toPosix(), normalizedNewContent, - normalizedEditedContent + normalizedEditedContent, ) return { newProblemsMessage, userEdits, finalContent: normalizedEditedContent } } else { @@ -227,7 +227,7 @@ export class DiffViewProvider { const edit = new vscode.WorkspaceEdit() const fullRange = new vscode.Range( updatedDocument.positionAt(0), - updatedDocument.positionAt(updatedDocument.getText().length) + updatedDocument.positionAt(updatedDocument.getText().length), ) edit.replace(updatedDocument.uri, fullRange, this.originalContent ?? "") // Apply the edit and save, since contents shouldnt have changed this wont show in local history unless of course the user made changes and saved during the edit @@ -251,7 +251,8 @@ export class DiffViewProvider { .flatMap((tg) => tg.tabs) .filter( (tab) => - tab.input instanceof vscode.TabInputTextDiff && tab.input?.original?.scheme === DIFF_VIEW_URI_SCHEME + tab.input instanceof vscode.TabInputTextDiff && + tab.input?.original?.scheme === DIFF_VIEW_URI_SCHEME, ) for (const tab of tabs) { // trying to close dirty views results in save popup @@ -273,7 +274,7 @@ export class DiffViewProvider { (tab) => tab.input instanceof vscode.TabInputTextDiff && tab.input?.original?.scheme === DIFF_VIEW_URI_SCHEME && - arePathsEqual(tab.input.modified.fsPath, uri.fsPath) + arePathsEqual(tab.input.modified.fsPath, uri.fsPath), ) if (diffTab && diffTab.input instanceof vscode.TabInputTextDiff) { const editor = await vscode.window.showTextDocument(diffTab.input.modified) @@ -295,7 +296,7 @@ export class DiffViewProvider { query: Buffer.from(this.originalContent ?? "").toString("base64"), }), uri, - `${fileName}: ${fileExists ? "Original ↔ Cline's Changes" : "New File"} (Editable)` + `${fileName}: ${fileExists ? "Original ↔ Cline's Changes" : "New File"} (Editable)`, ) // This may happen on very slow machines ie project idx setTimeout(() => { @@ -310,7 +311,7 @@ export class DiffViewProvider { const scrollLine = line + 4 this.activeDiffEditor.revealRange( new vscode.Range(scrollLine, 0, scrollLine, 0), - vscode.TextEditorRevealType.InCenter + vscode.TextEditorRevealType.InCenter, ) } } @@ -327,7 +328,7 @@ export class DiffViewProvider { // Found the first diff, scroll to it this.activeDiffEditor.revealRange( new vscode.Range(lineCount, 0, lineCount, 0), - vscode.TextEditorRevealType.InCenter + vscode.TextEditorRevealType.InCenter, ) return } diff --git a/src/integrations/editor/detect-omission.ts b/src/integrations/editor/detect-omission.ts index 78469df..32de0aa 100644 --- a/src/integrations/editor/detect-omission.ts +++ b/src/integrations/editor/detect-omission.ts @@ -43,14 +43,14 @@ export function showOmissionWarning(originalFileContent: string, newFileContent: vscode.window .showWarningMessage( "Potential code truncation detected. This happens when the AI reaches its max output limit.", - "Follow this guide to fix the issue" + "Follow this guide to fix the issue", ) .then((selection) => { if (selection === "Follow this guide to fix the issue") { vscode.env.openExternal( vscode.Uri.parse( - "https://github.com/cline/cline/wiki/Troubleshooting-%E2%80%90-Cline-Deleting-Code-with-%22Rest-of-Code-Here%22-Comments" - ) + "https://github.com/cline/cline/wiki/Troubleshooting-%E2%80%90-Cline-Deleting-Code-with-%22Rest-of-Code-Here%22-Comments", + ), ) } }) diff --git a/src/integrations/misc/export-markdown.ts b/src/integrations/misc/export-markdown.ts index 97c5c85..2aa9d7b 100644 --- a/src/integrations/misc/export-markdown.ts +++ b/src/integrations/misc/export-markdown.ts @@ -46,7 +46,7 @@ export function formatContentBlockToMarkdown( | Anthropic.TextBlockParam | Anthropic.ImageBlockParam | Anthropic.ToolUseBlockParam - | Anthropic.ToolResultBlockParam + | Anthropic.ToolResultBlockParam, // messages: Anthropic.MessageParam[] ): string { switch (block.type) { diff --git a/src/integrations/misc/open-file.ts b/src/integrations/misc/open-file.ts index 45e9876..8dc3029 100644 --- a/src/integrations/misc/open-file.ts +++ b/src/integrations/misc/open-file.ts @@ -28,12 +28,13 @@ export async function openFile(absolutePath: string) { try { for (const group of vscode.window.tabGroups.all) { const existingTab = group.tabs.find( - (tab) => tab.input instanceof vscode.TabInputText && arePathsEqual(tab.input.uri.fsPath, uri.fsPath) + (tab) => + tab.input instanceof vscode.TabInputText && arePathsEqual(tab.input.uri.fsPath, uri.fsPath), ) if (existingTab) { const activeColumn = vscode.window.activeTextEditor?.viewColumn const tabColumn = vscode.window.tabGroups.all.find((group) => - group.tabs.includes(existingTab) + group.tabs.includes(existingTab), )?.viewColumn if (activeColumn && activeColumn !== tabColumn && !existingTab.isDirty) { await vscode.window.tabGroups.close(existingTab) diff --git a/src/integrations/misc/process-images.ts b/src/integrations/misc/process-images.ts index fb0cfe7..cf3e201 100644 --- a/src/integrations/misc/process-images.ts +++ b/src/integrations/misc/process-images.ts @@ -25,7 +25,7 @@ export async function selectImages(): Promise { const mimeType = getMimeType(imagePath) const dataUrl = `data:${mimeType};base64,${base64}` return dataUrl - }) + }), ) } diff --git a/src/integrations/terminal/TerminalManager.ts b/src/integrations/terminal/TerminalManager.ts index 6c553fc..81e91ab 100644 --- a/src/integrations/terminal/TerminalManager.ts +++ b/src/integrations/terminal/TerminalManager.ts @@ -84,7 +84,7 @@ declare module "vscode" { onDidStartTerminalShellExecution?: ( listener: (e: any) => any, thisArgs?: any, - disposables?: vscode.Disposable[] + disposables?: vscode.Disposable[], ) => vscode.Disposable } } diff --git a/src/integrations/terminal/TerminalProcess.ts b/src/integrations/terminal/TerminalProcess.ts index 9621806..5597350 100644 --- a/src/integrations/terminal/TerminalProcess.ts +++ b/src/integrations/terminal/TerminalProcess.ts @@ -54,7 +54,7 @@ export class TerminalProcess extends EventEmitter { /* ddateb15026-6a64-40db-b21f-2a621a9830f0]633;CTue Sep 17 06:37:04 EDT 2024 % ]633;D;0]633;P;Cwd=/Users/saoud/Repositories/test */ // Gets output between ]633;C (command start) and ]633;D (command end) const outputBetweenSequences = this.removeLastLineArtifacts( - data.match(/\]633;C([\s\S]*?)\]633;D/)?.[1] || "" + data.match(/\]633;C([\s\S]*?)\]633;D/)?.[1] || "", ).trim() // Once we've retrieved any potential output between sequences, we can remove everything up to end of the last sequence @@ -142,7 +142,7 @@ export class TerminalProcess extends EventEmitter { () => { this.isHot = false }, - isCompiling ? PROCESS_HOT_TIMEOUT_COMPILING : PROCESS_HOT_TIMEOUT_NORMAL + isCompiling ? PROCESS_HOT_TIMEOUT_COMPILING : PROCESS_HOT_TIMEOUT_NORMAL, ) // For non-immediately returning commands we want to show loading spinner right away but this wouldnt happen until it emits a line break, so as soon as we get any output we emit "" to let webview know to show spinner @@ -240,7 +240,7 @@ export type TerminalProcessResultPromise = TerminalProcess & Promise export function mergePromise(process: TerminalProcess, promise: Promise): TerminalProcessResultPromise { const nativePromisePrototype = (async () => {})().constructor.prototype const descriptors = ["then", "catch", "finally"].map( - (property) => [property, Reflect.getOwnPropertyDescriptor(nativePromisePrototype, property)] as const + (property) => [property, Reflect.getOwnPropertyDescriptor(nativePromisePrototype, property)] as const, ) for (const [property, descriptor] of descriptors) { if (descriptor) { diff --git a/src/integrations/theme/default-themes/dark_modern.json b/src/integrations/theme/default-themes/dark_modern.json index b1c49c7..d24c79f 100644 --- a/src/integrations/theme/default-themes/dark_modern.json +++ b/src/integrations/theme/default-themes/dark_modern.json @@ -1,128 +1,128 @@ { - "$schema": "vscode://schemas/color-theme", - "name": "Default Dark Modern", - "include": "./dark_plus.json", - "colors": { - "activityBar.activeBorder": "#0078D4", - "activityBar.background": "#181818", - "activityBar.border": "#2B2B2B", - "activityBar.foreground": "#D7D7D7", - "activityBar.inactiveForeground": "#868686", - "activityBarBadge.background": "#0078D4", - "activityBarBadge.foreground": "#FFFFFF", - "badge.background": "#616161", - "badge.foreground": "#F8F8F8", - "button.background": "#0078D4", - "button.border": "#FFFFFF12", - "button.foreground": "#FFFFFF", - "button.hoverBackground": "#026EC1", - "button.secondaryBackground": "#313131", - "button.secondaryForeground": "#CCCCCC", - "button.secondaryHoverBackground": "#3C3C3C", - "chat.slashCommandBackground": "#34414B", - "chat.slashCommandForeground": "#40A6FF", - "checkbox.background": "#313131", - "checkbox.border": "#3C3C3C", - "debugToolBar.background": "#181818", - "descriptionForeground": "#9D9D9D", - "dropdown.background": "#313131", - "dropdown.border": "#3C3C3C", - "dropdown.foreground": "#CCCCCC", - "dropdown.listBackground": "#1F1F1F", - "editor.background": "#1F1F1F", - "editor.findMatchBackground": "#9E6A03", - "editor.foreground": "#CCCCCC", - "editorGroup.border": "#FFFFFF17", - "editorGroupHeader.tabsBackground": "#181818", - "editorGroupHeader.tabsBorder": "#2B2B2B", - "editorGutter.addedBackground": "#2EA043", - "editorGutter.deletedBackground": "#F85149", - "editorGutter.modifiedBackground": "#0078D4", - "editorLineNumber.activeForeground": "#CCCCCC", - "editorLineNumber.foreground": "#6E7681", - "editorOverviewRuler.border": "#010409", - "editorWidget.background": "#202020", - "errorForeground": "#F85149", - "focusBorder": "#0078D4", - "foreground": "#CCCCCC", - "icon.foreground": "#CCCCCC", - "input.background": "#313131", - "input.border": "#3C3C3C", - "input.foreground": "#CCCCCC", - "input.placeholderForeground": "#989898", - "inputOption.activeBackground": "#2489DB82", - "inputOption.activeBorder": "#2488DB", - "keybindingLabel.foreground": "#CCCCCC", - "menu.background": "#1F1F1F", - "notificationCenterHeader.background": "#1F1F1F", - "notificationCenterHeader.foreground": "#CCCCCC", - "notifications.background": "#1F1F1F", - "notifications.border": "#2B2B2B", - "notifications.foreground": "#CCCCCC", - "panel.background": "#181818", - "panel.border": "#2B2B2B", - "panelInput.border": "#2B2B2B", - "panelTitle.activeBorder": "#0078D4", - "panelTitle.activeForeground": "#CCCCCC", - "panelTitle.inactiveForeground": "#9D9D9D", - "peekViewEditor.background": "#1F1F1F", - "peekViewEditor.matchHighlightBackground": "#BB800966", - "peekViewResult.background": "#1F1F1F", - "peekViewResult.matchHighlightBackground": "#BB800966", - "pickerGroup.border": "#3C3C3C", - "progressBar.background": "#0078D4", - "quickInput.background": "#222222", - "quickInput.foreground": "#CCCCCC", - "settings.dropdownBackground": "#313131", - "settings.dropdownBorder": "#3C3C3C", - "settings.headerForeground": "#FFFFFF", - "settings.modifiedItemIndicator": "#BB800966", - "sideBar.background": "#181818", - "sideBar.border": "#2B2B2B", - "sideBar.foreground": "#CCCCCC", - "sideBarSectionHeader.background": "#181818", - "sideBarSectionHeader.border": "#2B2B2B", - "sideBarSectionHeader.foreground": "#CCCCCC", - "sideBarTitle.foreground": "#CCCCCC", - "statusBar.background": "#181818", - "statusBar.border": "#2B2B2B", - "statusBar.debuggingBackground": "#0078D4", - "statusBar.debuggingForeground": "#FFFFFF", - "statusBar.focusBorder": "#0078D4", - "statusBar.foreground": "#CCCCCC", - "statusBar.noFolderBackground": "#1F1F1F", - "statusBarItem.focusBorder": "#0078D4", - "statusBarItem.prominentBackground": "#6E768166", - "statusBarItem.remoteBackground": "#0078D4", - "statusBarItem.remoteForeground": "#FFFFFF", - "tab.activeBackground": "#1F1F1F", - "tab.activeBorder": "#1F1F1F", - "tab.activeBorderTop": "#0078D4", - "tab.activeForeground": "#FFFFFF", - "tab.border": "#2B2B2B", - "tab.hoverBackground": "#1F1F1F", - "tab.inactiveBackground": "#181818", - "tab.inactiveForeground": "#9D9D9D", - "tab.unfocusedActiveBorder": "#1F1F1F", - "tab.unfocusedActiveBorderTop": "#2B2B2B", - "tab.unfocusedHoverBackground": "#1F1F1F", - "terminal.foreground": "#CCCCCC", - "terminal.tab.activeBorder": "#0078D4", - "textBlockQuote.background": "#2B2B2B", - "textBlockQuote.border": "#616161", - "textCodeBlock.background": "#2B2B2B", - "textLink.activeForeground": "#4daafc", - "textLink.foreground": "#4daafc", - "textPreformat.foreground": "#D0D0D0", - "textPreformat.background": "#3C3C3C", - "textSeparator.foreground": "#21262D", - "titleBar.activeBackground": "#181818", - "titleBar.activeForeground": "#CCCCCC", - "titleBar.border": "#2B2B2B", - "titleBar.inactiveBackground": "#1F1F1F", - "titleBar.inactiveForeground": "#9D9D9D", - "welcomePage.tileBackground": "#2B2B2B", - "welcomePage.progress.foreground": "#0078D4", - "widget.border": "#313131" - } + "$schema": "vscode://schemas/color-theme", + "name": "Default Dark Modern", + "include": "./dark_plus.json", + "colors": { + "activityBar.activeBorder": "#0078D4", + "activityBar.background": "#181818", + "activityBar.border": "#2B2B2B", + "activityBar.foreground": "#D7D7D7", + "activityBar.inactiveForeground": "#868686", + "activityBarBadge.background": "#0078D4", + "activityBarBadge.foreground": "#FFFFFF", + "badge.background": "#616161", + "badge.foreground": "#F8F8F8", + "button.background": "#0078D4", + "button.border": "#FFFFFF12", + "button.foreground": "#FFFFFF", + "button.hoverBackground": "#026EC1", + "button.secondaryBackground": "#313131", + "button.secondaryForeground": "#CCCCCC", + "button.secondaryHoverBackground": "#3C3C3C", + "chat.slashCommandBackground": "#34414B", + "chat.slashCommandForeground": "#40A6FF", + "checkbox.background": "#313131", + "checkbox.border": "#3C3C3C", + "debugToolBar.background": "#181818", + "descriptionForeground": "#9D9D9D", + "dropdown.background": "#313131", + "dropdown.border": "#3C3C3C", + "dropdown.foreground": "#CCCCCC", + "dropdown.listBackground": "#1F1F1F", + "editor.background": "#1F1F1F", + "editor.findMatchBackground": "#9E6A03", + "editor.foreground": "#CCCCCC", + "editorGroup.border": "#FFFFFF17", + "editorGroupHeader.tabsBackground": "#181818", + "editorGroupHeader.tabsBorder": "#2B2B2B", + "editorGutter.addedBackground": "#2EA043", + "editorGutter.deletedBackground": "#F85149", + "editorGutter.modifiedBackground": "#0078D4", + "editorLineNumber.activeForeground": "#CCCCCC", + "editorLineNumber.foreground": "#6E7681", + "editorOverviewRuler.border": "#010409", + "editorWidget.background": "#202020", + "errorForeground": "#F85149", + "focusBorder": "#0078D4", + "foreground": "#CCCCCC", + "icon.foreground": "#CCCCCC", + "input.background": "#313131", + "input.border": "#3C3C3C", + "input.foreground": "#CCCCCC", + "input.placeholderForeground": "#989898", + "inputOption.activeBackground": "#2489DB82", + "inputOption.activeBorder": "#2488DB", + "keybindingLabel.foreground": "#CCCCCC", + "menu.background": "#1F1F1F", + "notificationCenterHeader.background": "#1F1F1F", + "notificationCenterHeader.foreground": "#CCCCCC", + "notifications.background": "#1F1F1F", + "notifications.border": "#2B2B2B", + "notifications.foreground": "#CCCCCC", + "panel.background": "#181818", + "panel.border": "#2B2B2B", + "panelInput.border": "#2B2B2B", + "panelTitle.activeBorder": "#0078D4", + "panelTitle.activeForeground": "#CCCCCC", + "panelTitle.inactiveForeground": "#9D9D9D", + "peekViewEditor.background": "#1F1F1F", + "peekViewEditor.matchHighlightBackground": "#BB800966", + "peekViewResult.background": "#1F1F1F", + "peekViewResult.matchHighlightBackground": "#BB800966", + "pickerGroup.border": "#3C3C3C", + "progressBar.background": "#0078D4", + "quickInput.background": "#222222", + "quickInput.foreground": "#CCCCCC", + "settings.dropdownBackground": "#313131", + "settings.dropdownBorder": "#3C3C3C", + "settings.headerForeground": "#FFFFFF", + "settings.modifiedItemIndicator": "#BB800966", + "sideBar.background": "#181818", + "sideBar.border": "#2B2B2B", + "sideBar.foreground": "#CCCCCC", + "sideBarSectionHeader.background": "#181818", + "sideBarSectionHeader.border": "#2B2B2B", + "sideBarSectionHeader.foreground": "#CCCCCC", + "sideBarTitle.foreground": "#CCCCCC", + "statusBar.background": "#181818", + "statusBar.border": "#2B2B2B", + "statusBar.debuggingBackground": "#0078D4", + "statusBar.debuggingForeground": "#FFFFFF", + "statusBar.focusBorder": "#0078D4", + "statusBar.foreground": "#CCCCCC", + "statusBar.noFolderBackground": "#1F1F1F", + "statusBarItem.focusBorder": "#0078D4", + "statusBarItem.prominentBackground": "#6E768166", + "statusBarItem.remoteBackground": "#0078D4", + "statusBarItem.remoteForeground": "#FFFFFF", + "tab.activeBackground": "#1F1F1F", + "tab.activeBorder": "#1F1F1F", + "tab.activeBorderTop": "#0078D4", + "tab.activeForeground": "#FFFFFF", + "tab.border": "#2B2B2B", + "tab.hoverBackground": "#1F1F1F", + "tab.inactiveBackground": "#181818", + "tab.inactiveForeground": "#9D9D9D", + "tab.unfocusedActiveBorder": "#1F1F1F", + "tab.unfocusedActiveBorderTop": "#2B2B2B", + "tab.unfocusedHoverBackground": "#1F1F1F", + "terminal.foreground": "#CCCCCC", + "terminal.tab.activeBorder": "#0078D4", + "textBlockQuote.background": "#2B2B2B", + "textBlockQuote.border": "#616161", + "textCodeBlock.background": "#2B2B2B", + "textLink.activeForeground": "#4daafc", + "textLink.foreground": "#4daafc", + "textPreformat.foreground": "#D0D0D0", + "textPreformat.background": "#3C3C3C", + "textSeparator.foreground": "#21262D", + "titleBar.activeBackground": "#181818", + "titleBar.activeForeground": "#CCCCCC", + "titleBar.border": "#2B2B2B", + "titleBar.inactiveBackground": "#1F1F1F", + "titleBar.inactiveForeground": "#9D9D9D", + "welcomePage.tileBackground": "#2B2B2B", + "welcomePage.progress.foreground": "#0078D4", + "widget.border": "#313131" + } } diff --git a/src/integrations/theme/default-themes/dark_plus.json b/src/integrations/theme/default-themes/dark_plus.json index c13c17a..3a45b1e 100644 --- a/src/integrations/theme/default-themes/dark_plus.json +++ b/src/integrations/theme/default-themes/dark_plus.json @@ -1,193 +1,193 @@ { - "$schema": "vscode://schemas/color-theme", - "name": "Dark+", - "include": "./dark_vs.json", - "tokenColors": [ - { - "name": "Function declarations", - "scope": [ - "entity.name.function", - "support.function", - "support.constant.handlebars", - "source.powershell variable.other.member", - "entity.name.operator.custom-literal" - ], - "settings": { - "foreground": "#DCDCAA" - } - }, - { - "name": "Types declaration and references", - "scope": [ - "support.class", - "support.type", - "entity.name.type", - "entity.name.namespace", - "entity.other.attribute", - "entity.name.scope-resolution", - "entity.name.class", - "storage.type.numeric.go", - "storage.type.byte.go", - "storage.type.boolean.go", - "storage.type.string.go", - "storage.type.uintptr.go", - "storage.type.error.go", - "storage.type.rune.go", - "storage.type.cs", - "storage.type.generic.cs", - "storage.type.modifier.cs", - "storage.type.variable.cs", - "storage.type.annotation.java", - "storage.type.generic.java", - "storage.type.java", - "storage.type.object.array.java", - "storage.type.primitive.array.java", - "storage.type.primitive.java", - "storage.type.token.java", - "storage.type.groovy", - "storage.type.annotation.groovy", - "storage.type.parameters.groovy", - "storage.type.generic.groovy", - "storage.type.object.array.groovy", - "storage.type.primitive.array.groovy", - "storage.type.primitive.groovy" - ], - "settings": { - "foreground": "#4EC9B0" - } - }, - { - "name": "Types declaration and references, TS grammar specific", - "scope": [ - "meta.type.cast.expr", - "meta.type.new.expr", - "support.constant.math", - "support.constant.dom", - "support.constant.json", - "entity.other.inherited-class" - ], - "settings": { - "foreground": "#4EC9B0" - } - }, - { - "name": "Control flow / Special keywords", - "scope": [ - "keyword.control", - "source.cpp keyword.operator.new", - "keyword.operator.delete", - "keyword.other.using", - "keyword.other.directive.using", - "keyword.other.operator", - "entity.name.operator" - ], - "settings": { - "foreground": "#C586C0" - } - }, - { - "name": "Variable and parameter name", - "scope": [ - "variable", - "meta.definition.variable.name", - "support.variable", - "entity.name.variable", - "constant.other.placeholder" - ], - "settings": { - "foreground": "#9CDCFE" - } - }, - { - "name": "Constants and enums", - "scope": ["variable.other.constant", "variable.other.enummember"], - "settings": { - "foreground": "#4FC1FF" - } - }, - { - "name": "Object keys, TS grammar specific", - "scope": ["meta.object-literal.key"], - "settings": { - "foreground": "#9CDCFE" - } - }, - { - "name": "CSS property value", - "scope": [ - "support.constant.property-value", - "support.constant.font-name", - "support.constant.media-type", - "support.constant.media", - "constant.other.color.rgb-value", - "constant.other.rgb-value", - "support.constant.color" - ], - "settings": { - "foreground": "#CE9178" - } - }, - { - "name": "Regular expression groups", - "scope": [ - "punctuation.definition.group.regexp", - "punctuation.definition.group.assertion.regexp", - "punctuation.definition.character-class.regexp", - "punctuation.character.set.begin.regexp", - "punctuation.character.set.end.regexp", - "keyword.operator.negation.regexp", - "support.other.parenthesis.regexp" - ], - "settings": { - "foreground": "#CE9178" - } - }, - { - "scope": [ - "constant.character.character-class.regexp", - "constant.other.character-class.set.regexp", - "constant.other.character-class.regexp", - "constant.character.set.regexp" - ], - "settings": { - "foreground": "#d16969" - } - }, - { - "scope": ["keyword.operator.or.regexp", "keyword.control.anchor.regexp"], - "settings": { - "foreground": "#DCDCAA" - } - }, - { - "scope": "keyword.operator.quantifier.regexp", - "settings": { - "foreground": "#d7ba7d" - } - }, - { - "scope": ["constant.character", "constant.other.option"], - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "constant.character.escape", - "settings": { - "foreground": "#d7ba7d" - } - }, - { - "scope": "entity.name.label", - "settings": { - "foreground": "#C8C8C8" - } - } - ], - "semanticTokenColors": { - "newOperator": "#C586C0", - "stringLiteral": "#ce9178", - "customLiteral": "#DCDCAA", - "numberLiteral": "#b5cea8" - } + "$schema": "vscode://schemas/color-theme", + "name": "Dark+", + "include": "./dark_vs.json", + "tokenColors": [ + { + "name": "Function declarations", + "scope": [ + "entity.name.function", + "support.function", + "support.constant.handlebars", + "source.powershell variable.other.member", + "entity.name.operator.custom-literal" + ], + "settings": { + "foreground": "#DCDCAA" + } + }, + { + "name": "Types declaration and references", + "scope": [ + "support.class", + "support.type", + "entity.name.type", + "entity.name.namespace", + "entity.other.attribute", + "entity.name.scope-resolution", + "entity.name.class", + "storage.type.numeric.go", + "storage.type.byte.go", + "storage.type.boolean.go", + "storage.type.string.go", + "storage.type.uintptr.go", + "storage.type.error.go", + "storage.type.rune.go", + "storage.type.cs", + "storage.type.generic.cs", + "storage.type.modifier.cs", + "storage.type.variable.cs", + "storage.type.annotation.java", + "storage.type.generic.java", + "storage.type.java", + "storage.type.object.array.java", + "storage.type.primitive.array.java", + "storage.type.primitive.java", + "storage.type.token.java", + "storage.type.groovy", + "storage.type.annotation.groovy", + "storage.type.parameters.groovy", + "storage.type.generic.groovy", + "storage.type.object.array.groovy", + "storage.type.primitive.array.groovy", + "storage.type.primitive.groovy" + ], + "settings": { + "foreground": "#4EC9B0" + } + }, + { + "name": "Types declaration and references, TS grammar specific", + "scope": [ + "meta.type.cast.expr", + "meta.type.new.expr", + "support.constant.math", + "support.constant.dom", + "support.constant.json", + "entity.other.inherited-class" + ], + "settings": { + "foreground": "#4EC9B0" + } + }, + { + "name": "Control flow / Special keywords", + "scope": [ + "keyword.control", + "source.cpp keyword.operator.new", + "keyword.operator.delete", + "keyword.other.using", + "keyword.other.directive.using", + "keyword.other.operator", + "entity.name.operator" + ], + "settings": { + "foreground": "#C586C0" + } + }, + { + "name": "Variable and parameter name", + "scope": [ + "variable", + "meta.definition.variable.name", + "support.variable", + "entity.name.variable", + "constant.other.placeholder" + ], + "settings": { + "foreground": "#9CDCFE" + } + }, + { + "name": "Constants and enums", + "scope": ["variable.other.constant", "variable.other.enummember"], + "settings": { + "foreground": "#4FC1FF" + } + }, + { + "name": "Object keys, TS grammar specific", + "scope": ["meta.object-literal.key"], + "settings": { + "foreground": "#9CDCFE" + } + }, + { + "name": "CSS property value", + "scope": [ + "support.constant.property-value", + "support.constant.font-name", + "support.constant.media-type", + "support.constant.media", + "constant.other.color.rgb-value", + "constant.other.rgb-value", + "support.constant.color" + ], + "settings": { + "foreground": "#CE9178" + } + }, + { + "name": "Regular expression groups", + "scope": [ + "punctuation.definition.group.regexp", + "punctuation.definition.group.assertion.regexp", + "punctuation.definition.character-class.regexp", + "punctuation.character.set.begin.regexp", + "punctuation.character.set.end.regexp", + "keyword.operator.negation.regexp", + "support.other.parenthesis.regexp" + ], + "settings": { + "foreground": "#CE9178" + } + }, + { + "scope": [ + "constant.character.character-class.regexp", + "constant.other.character-class.set.regexp", + "constant.other.character-class.regexp", + "constant.character.set.regexp" + ], + "settings": { + "foreground": "#d16969" + } + }, + { + "scope": ["keyword.operator.or.regexp", "keyword.control.anchor.regexp"], + "settings": { + "foreground": "#DCDCAA" + } + }, + { + "scope": "keyword.operator.quantifier.regexp", + "settings": { + "foreground": "#d7ba7d" + } + }, + { + "scope": ["constant.character", "constant.other.option"], + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": "constant.character.escape", + "settings": { + "foreground": "#d7ba7d" + } + }, + { + "scope": "entity.name.label", + "settings": { + "foreground": "#C8C8C8" + } + } + ], + "semanticTokenColors": { + "newOperator": "#C586C0", + "stringLiteral": "#ce9178", + "customLiteral": "#DCDCAA", + "numberLiteral": "#b5cea8" + } } diff --git a/src/integrations/theme/default-themes/dark_vs.json b/src/integrations/theme/default-themes/dark_vs.json index 0bf6a19..e2f0781 100644 --- a/src/integrations/theme/default-themes/dark_vs.json +++ b/src/integrations/theme/default-themes/dark_vs.json @@ -1,394 +1,391 @@ { - "$schema": "vscode://schemas/color-theme", - "name": "Dark (Visual Studio)", - "colors": { - "checkbox.border": "#6B6B6B", - "editor.background": "#1E1E1E", - "editor.foreground": "#D4D4D4", - "editor.inactiveSelectionBackground": "#3A3D41", - "editorIndentGuide.background1": "#404040", - "editorIndentGuide.activeBackground1": "#707070", - "editor.selectionHighlightBackground": "#ADD6FF26", - "list.dropBackground": "#383B3D", - "activityBarBadge.background": "#007ACC", - "sideBarTitle.foreground": "#BBBBBB", - "input.placeholderForeground": "#A6A6A6", - "menu.background": "#252526", - "menu.foreground": "#CCCCCC", - "menu.separatorBackground": "#454545", - "menu.border": "#454545", - "statusBarItem.remoteForeground": "#FFF", - "statusBarItem.remoteBackground": "#16825D", - "ports.iconRunningProcessForeground": "#369432", - "sideBarSectionHeader.background": "#0000", - "sideBarSectionHeader.border": "#ccc3", - "tab.lastPinnedBorder": "#ccc3", - "list.activeSelectionIconForeground": "#FFF", - "terminal.inactiveSelectionBackground": "#3A3D41", - "widget.border": "#303031", - "actionBar.toggledBackground": "#383a49" - }, - "tokenColors": [ - { - "scope": [ - "meta.embedded", - "source.groovy.embedded", - "string meta.image.inline.markdown", - "variable.legacy.builtin.python" - ], - "settings": { - "foreground": "#D4D4D4" - } - }, - { - "scope": "emphasis", - "settings": { - "fontStyle": "italic" - } - }, - { - "scope": "strong", - "settings": { - "fontStyle": "bold" - } - }, - { - "scope": "header", - "settings": { - "foreground": "#000080" - } - }, - { - "scope": "comment", - "settings": { - "foreground": "#6A9955" - } - }, - { - "scope": "constant.language", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": [ - "constant.numeric", - "variable.other.enummember", - "keyword.operator.plus.exponent", - "keyword.operator.minus.exponent" - ], - "settings": { - "foreground": "#b5cea8" - } - }, - { - "scope": "constant.regexp", - "settings": { - "foreground": "#646695" - } - }, - { - "scope": "entity.name.tag", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": ["entity.name.tag.css", "entity.name.tag.less"], - "settings": { - "foreground": "#d7ba7d" - } - }, - { - "scope": "entity.other.attribute-name", - "settings": { - "foreground": "#9cdcfe" - } - }, - { - "scope": [ - "entity.other.attribute-name.class.css", - "source.css entity.other.attribute-name.class", - "entity.other.attribute-name.id.css", - "entity.other.attribute-name.parent-selector.css", - "entity.other.attribute-name.parent.less", - "source.css entity.other.attribute-name.pseudo-class", - "entity.other.attribute-name.pseudo-element.css", - "source.css.less entity.other.attribute-name.id", - "entity.other.attribute-name.scss" - ], - "settings": { - "foreground": "#d7ba7d" - } - }, - { - "scope": "invalid", - "settings": { - "foreground": "#f44747" - } - }, - { - "scope": "markup.underline", - "settings": { - "fontStyle": "underline" - } - }, - { - "scope": "markup.bold", - "settings": { - "fontStyle": "bold", - "foreground": "#569cd6" - } - }, - { - "scope": "markup.heading", - "settings": { - "fontStyle": "bold", - "foreground": "#569cd6" - } - }, - { - "scope": "markup.italic", - "settings": { - "fontStyle": "italic" - } - }, - { - "scope": "markup.strikethrough", - "settings": { - "fontStyle": "strikethrough" - } - }, - { - "scope": "markup.inserted", - "settings": { - "foreground": "#b5cea8" - } - }, - { - "scope": "markup.deleted", - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "markup.changed", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "punctuation.definition.quote.begin.markdown", - "settings": { - "foreground": "#6A9955" - } - }, - { - "scope": "punctuation.definition.list.begin.markdown", - "settings": { - "foreground": "#6796e6" - } - }, - { - "scope": "markup.inline.raw", - "settings": { - "foreground": "#ce9178" - } - }, - { - "name": "brackets of XML/HTML tags", - "scope": "punctuation.definition.tag", - "settings": { - "foreground": "#808080" - } - }, - { - "scope": ["meta.preprocessor", "entity.name.function.preprocessor"], - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "meta.preprocessor.string", - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "meta.preprocessor.numeric", - "settings": { - "foreground": "#b5cea8" - } - }, - { - "scope": "meta.structure.dictionary.key.python", - "settings": { - "foreground": "#9cdcfe" - } - }, - { - "scope": "meta.diff.header", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "storage", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "storage.type", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": ["storage.modifier", "keyword.operator.noexcept"], - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": ["string", "meta.embedded.assembly"], - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "string.tag", - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "string.value", - "settings": { - "foreground": "#ce9178" - } - }, - { - "scope": "string.regexp", - "settings": { - "foreground": "#d16969" - } - }, - { - "name": "String interpolation", - "scope": [ - "punctuation.definition.template-expression.begin", - "punctuation.definition.template-expression.end", - "punctuation.section.embedded" - ], - "settings": { - "foreground": "#569cd6" - } - }, - { - "name": "Reset JavaScript string interpolation expression", - "scope": ["meta.template.expression"], - "settings": { - "foreground": "#d4d4d4" - } - }, - { - "scope": [ - "support.type.vendored.property-name", - "support.type.property-name", - "source.css variable", - "source.coffee.embedded" - ], - "settings": { - "foreground": "#9cdcfe" - } - }, - { - "scope": "keyword", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "keyword.control", - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "keyword.operator", - "settings": { - "foreground": "#d4d4d4" - } - }, - { - "scope": [ - "keyword.operator.new", - "keyword.operator.expression", - "keyword.operator.cast", - "keyword.operator.sizeof", - "keyword.operator.alignof", - "keyword.operator.typeid", - "keyword.operator.alignas", - "keyword.operator.instanceof", - "keyword.operator.logical.python", - "keyword.operator.wordlike" - ], - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "keyword.other.unit", - "settings": { - "foreground": "#b5cea8" - } - }, - { - "scope": [ - "punctuation.section.embedded.begin.php", - "punctuation.section.embedded.end.php" - ], - "settings": { - "foreground": "#569cd6" - } - }, - { - "scope": "support.function.git-rebase", - "settings": { - "foreground": "#9cdcfe" - } - }, - { - "scope": "constant.sha.git-rebase", - "settings": { - "foreground": "#b5cea8" - } - }, - { - "name": "coloring of the Java import and package identifiers", - "scope": [ - "storage.modifier.import.java", - "variable.language.wildcard.java", - "storage.modifier.package.java" - ], - "settings": { - "foreground": "#d4d4d4" - } - }, - { - "name": "this.self", - "scope": "variable.language", - "settings": { - "foreground": "#569cd6" - } - } - ], - "semanticHighlighting": true, - "semanticTokenColors": { - "newOperator": "#d4d4d4", - "stringLiteral": "#ce9178", - "customLiteral": "#D4D4D4", - "numberLiteral": "#b5cea8" - } + "$schema": "vscode://schemas/color-theme", + "name": "Dark (Visual Studio)", + "colors": { + "checkbox.border": "#6B6B6B", + "editor.background": "#1E1E1E", + "editor.foreground": "#D4D4D4", + "editor.inactiveSelectionBackground": "#3A3D41", + "editorIndentGuide.background1": "#404040", + "editorIndentGuide.activeBackground1": "#707070", + "editor.selectionHighlightBackground": "#ADD6FF26", + "list.dropBackground": "#383B3D", + "activityBarBadge.background": "#007ACC", + "sideBarTitle.foreground": "#BBBBBB", + "input.placeholderForeground": "#A6A6A6", + "menu.background": "#252526", + "menu.foreground": "#CCCCCC", + "menu.separatorBackground": "#454545", + "menu.border": "#454545", + "statusBarItem.remoteForeground": "#FFF", + "statusBarItem.remoteBackground": "#16825D", + "ports.iconRunningProcessForeground": "#369432", + "sideBarSectionHeader.background": "#0000", + "sideBarSectionHeader.border": "#ccc3", + "tab.lastPinnedBorder": "#ccc3", + "list.activeSelectionIconForeground": "#FFF", + "terminal.inactiveSelectionBackground": "#3A3D41", + "widget.border": "#303031", + "actionBar.toggledBackground": "#383a49" + }, + "tokenColors": [ + { + "scope": [ + "meta.embedded", + "source.groovy.embedded", + "string meta.image.inline.markdown", + "variable.legacy.builtin.python" + ], + "settings": { + "foreground": "#D4D4D4" + } + }, + { + "scope": "emphasis", + "settings": { + "fontStyle": "italic" + } + }, + { + "scope": "strong", + "settings": { + "fontStyle": "bold" + } + }, + { + "scope": "header", + "settings": { + "foreground": "#000080" + } + }, + { + "scope": "comment", + "settings": { + "foreground": "#6A9955" + } + }, + { + "scope": "constant.language", + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": [ + "constant.numeric", + "variable.other.enummember", + "keyword.operator.plus.exponent", + "keyword.operator.minus.exponent" + ], + "settings": { + "foreground": "#b5cea8" + } + }, + { + "scope": "constant.regexp", + "settings": { + "foreground": "#646695" + } + }, + { + "scope": "entity.name.tag", + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": ["entity.name.tag.css", "entity.name.tag.less"], + "settings": { + "foreground": "#d7ba7d" + } + }, + { + "scope": "entity.other.attribute-name", + "settings": { + "foreground": "#9cdcfe" + } + }, + { + "scope": [ + "entity.other.attribute-name.class.css", + "source.css entity.other.attribute-name.class", + "entity.other.attribute-name.id.css", + "entity.other.attribute-name.parent-selector.css", + "entity.other.attribute-name.parent.less", + "source.css entity.other.attribute-name.pseudo-class", + "entity.other.attribute-name.pseudo-element.css", + "source.css.less entity.other.attribute-name.id", + "entity.other.attribute-name.scss" + ], + "settings": { + "foreground": "#d7ba7d" + } + }, + { + "scope": "invalid", + "settings": { + "foreground": "#f44747" + } + }, + { + "scope": "markup.underline", + "settings": { + "fontStyle": "underline" + } + }, + { + "scope": "markup.bold", + "settings": { + "fontStyle": "bold", + "foreground": "#569cd6" + } + }, + { + "scope": "markup.heading", + "settings": { + "fontStyle": "bold", + "foreground": "#569cd6" + } + }, + { + "scope": "markup.italic", + "settings": { + "fontStyle": "italic" + } + }, + { + "scope": "markup.strikethrough", + "settings": { + "fontStyle": "strikethrough" + } + }, + { + "scope": "markup.inserted", + "settings": { + "foreground": "#b5cea8" + } + }, + { + "scope": "markup.deleted", + "settings": { + "foreground": "#ce9178" + } + }, + { + "scope": "markup.changed", + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": "punctuation.definition.quote.begin.markdown", + "settings": { + "foreground": "#6A9955" + } + }, + { + "scope": "punctuation.definition.list.begin.markdown", + "settings": { + "foreground": "#6796e6" + } + }, + { + "scope": "markup.inline.raw", + "settings": { + "foreground": "#ce9178" + } + }, + { + "name": "brackets of XML/HTML tags", + "scope": "punctuation.definition.tag", + "settings": { + "foreground": "#808080" + } + }, + { + "scope": ["meta.preprocessor", "entity.name.function.preprocessor"], + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": "meta.preprocessor.string", + "settings": { + "foreground": "#ce9178" + } + }, + { + "scope": "meta.preprocessor.numeric", + "settings": { + "foreground": "#b5cea8" + } + }, + { + "scope": "meta.structure.dictionary.key.python", + "settings": { + "foreground": "#9cdcfe" + } + }, + { + "scope": "meta.diff.header", + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": "storage", + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": "storage.type", + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": ["storage.modifier", "keyword.operator.noexcept"], + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": ["string", "meta.embedded.assembly"], + "settings": { + "foreground": "#ce9178" + } + }, + { + "scope": "string.tag", + "settings": { + "foreground": "#ce9178" + } + }, + { + "scope": "string.value", + "settings": { + "foreground": "#ce9178" + } + }, + { + "scope": "string.regexp", + "settings": { + "foreground": "#d16969" + } + }, + { + "name": "String interpolation", + "scope": [ + "punctuation.definition.template-expression.begin", + "punctuation.definition.template-expression.end", + "punctuation.section.embedded" + ], + "settings": { + "foreground": "#569cd6" + } + }, + { + "name": "Reset JavaScript string interpolation expression", + "scope": ["meta.template.expression"], + "settings": { + "foreground": "#d4d4d4" + } + }, + { + "scope": [ + "support.type.vendored.property-name", + "support.type.property-name", + "source.css variable", + "source.coffee.embedded" + ], + "settings": { + "foreground": "#9cdcfe" + } + }, + { + "scope": "keyword", + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": "keyword.control", + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": "keyword.operator", + "settings": { + "foreground": "#d4d4d4" + } + }, + { + "scope": [ + "keyword.operator.new", + "keyword.operator.expression", + "keyword.operator.cast", + "keyword.operator.sizeof", + "keyword.operator.alignof", + "keyword.operator.typeid", + "keyword.operator.alignas", + "keyword.operator.instanceof", + "keyword.operator.logical.python", + "keyword.operator.wordlike" + ], + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": "keyword.other.unit", + "settings": { + "foreground": "#b5cea8" + } + }, + { + "scope": ["punctuation.section.embedded.begin.php", "punctuation.section.embedded.end.php"], + "settings": { + "foreground": "#569cd6" + } + }, + { + "scope": "support.function.git-rebase", + "settings": { + "foreground": "#9cdcfe" + } + }, + { + "scope": "constant.sha.git-rebase", + "settings": { + "foreground": "#b5cea8" + } + }, + { + "name": "coloring of the Java import and package identifiers", + "scope": [ + "storage.modifier.import.java", + "variable.language.wildcard.java", + "storage.modifier.package.java" + ], + "settings": { + "foreground": "#d4d4d4" + } + }, + { + "name": "this.self", + "scope": "variable.language", + "settings": { + "foreground": "#569cd6" + } + } + ], + "semanticHighlighting": true, + "semanticTokenColors": { + "newOperator": "#d4d4d4", + "stringLiteral": "#ce9178", + "customLiteral": "#D4D4D4", + "numberLiteral": "#b5cea8" + } } diff --git a/src/integrations/theme/default-themes/hc_black.json b/src/integrations/theme/default-themes/hc_black.json index ebb49d9..b446ebc 100644 --- a/src/integrations/theme/default-themes/hc_black.json +++ b/src/integrations/theme/default-themes/hc_black.json @@ -86,10 +86,7 @@ } }, { - "scope": [ - "entity.name.tag.css", - "entity.name.tag.less" - ], + "scope": ["entity.name.tag.css", "entity.name.tag.less"], "settings": { "foreground": "#d7ba7d" } @@ -173,9 +170,7 @@ }, { "name": "brackets of XML/HTML tags", - "scope": [ - "punctuation.definition.tag" - ], + "scope": ["punctuation.definition.tag"], "settings": { "foreground": "#808080" } @@ -259,9 +254,7 @@ }, { "name": "Reset JavaScript string interpolation expression", - "scope": [ - "meta.template.expression" - ], + "scope": ["meta.template.expression"], "settings": { "foreground": "#ffffff" } @@ -417,20 +410,14 @@ }, { "name": "Variable and parameter name", - "scope": [ - "variable", - "meta.definition.variable.name", - "support.variable" - ], + "scope": ["variable", "meta.definition.variable.name", "support.variable"], "settings": { "foreground": "#9CDCFE" } }, { "name": "Object keys, TS grammar specific", - "scope": [ - "meta.object-literal.key" - ], + "scope": ["meta.object-literal.key"], "settings": { "foreground": "#9CDCFE" } diff --git a/src/integrations/theme/default-themes/hc_light.json b/src/integrations/theme/default-themes/hc_light.json index 460f26a..1abecd3 100644 --- a/src/integrations/theme/default-themes/hc_light.json +++ b/src/integrations/theme/default-themes/hc_light.json @@ -3,11 +3,7 @@ "name": "Light High Contrast", "tokenColors": [ { - "scope": [ - "meta.embedded", - "source.groovy.embedded", - "variable.legacy.builtin.python" - ], + "scope": ["meta.embedded", "source.groovy.embedded", "variable.legacy.builtin.python"], "settings": { "foreground": "#292929" } @@ -150,10 +146,7 @@ } }, { - "scope": [ - "punctuation.definition.quote.begin.markdown", - "punctuation.definition.list.begin.markdown" - ], + "scope": ["punctuation.definition.quote.begin.markdown", "punctuation.definition.list.begin.markdown"], "settings": { "foreground": "#0451A5" } @@ -335,10 +328,7 @@ } }, { - "scope": [ - "punctuation.section.embedded.begin.php", - "punctuation.section.embedded.end.php" - ], + "scope": ["punctuation.section.embedded.begin.php", "punctuation.section.embedded.end.php"], "settings": { "foreground": "#0F4A85" } diff --git a/src/integrations/theme/default-themes/light_modern.json b/src/integrations/theme/default-themes/light_modern.json index c8f37de..3057be5 100644 --- a/src/integrations/theme/default-themes/light_modern.json +++ b/src/integrations/theme/default-themes/light_modern.json @@ -1,145 +1,145 @@ { - "$schema": "vscode://schemas/color-theme", - "name": "Default Light Modern", - "include": "./light_plus.json", - "colors": { - "activityBar.activeBorder": "#005FB8", - "activityBar.background": "#F8F8F8", - "activityBar.border": "#E5E5E5", - "activityBar.foreground": "#1F1F1F", - "activityBar.inactiveForeground": "#616161", - "activityBarBadge.background": "#005FB8", - "activityBarBadge.foreground": "#FFFFFF", - "badge.background": "#CCCCCC", - "badge.foreground": "#3B3B3B", - "button.background": "#005FB8", - "button.border": "#0000001a", - "button.foreground": "#FFFFFF", - "button.hoverBackground": "#0258A8", - "button.secondaryBackground": "#E5E5E5", - "button.secondaryForeground": "#3B3B3B", - "button.secondaryHoverBackground": "#CCCCCC", - "chat.slashCommandBackground": "#D2ECFF", - "chat.slashCommandForeground": "#306CA2", - "checkbox.background": "#F8F8F8", - "checkbox.border": "#CECECE", - "descriptionForeground": "#3B3B3B", - "dropdown.background": "#FFFFFF", - "dropdown.border": "#CECECE", - "dropdown.foreground": "#3B3B3B", - "dropdown.listBackground": "#FFFFFF", - "editor.background": "#FFFFFF", - "editor.foreground": "#3B3B3B", - "editor.inactiveSelectionBackground": "#E5EBF1", - "editor.selectionHighlightBackground": "#ADD6FF80", - "editorGroup.border": "#E5E5E5", - "editorGroupHeader.tabsBackground": "#F8F8F8", - "editorGroupHeader.tabsBorder": "#E5E5E5", - "editorGutter.addedBackground": "#2EA043", - "editorGutter.deletedBackground": "#F85149", - "editorGutter.modifiedBackground": "#005FB8", - "editorIndentGuide.background1": "#D3D3D3", - "editorLineNumber.activeForeground": "#171184", - "editorLineNumber.foreground": "#6E7681", - "editorOverviewRuler.border": "#E5E5E5", - "editorSuggestWidget.background": "#F8F8F8", - "editorWidget.background": "#F8F8F8", - "errorForeground": "#F85149", - "focusBorder": "#005FB8", - "foreground": "#3B3B3B", - "icon.foreground": "#3B3B3B", - "input.background": "#FFFFFF", - "input.border": "#CECECE", - "input.foreground": "#3B3B3B", - "input.placeholderForeground": "#767676", - "inputOption.activeBackground": "#BED6ED", - "inputOption.activeBorder": "#005FB8", - "inputOption.activeForeground": "#000000", - "keybindingLabel.foreground": "#3B3B3B", - "list.activeSelectionBackground": "#E8E8E8", - "list.activeSelectionForeground": "#000000", - "list.activeSelectionIconForeground": "#000000", - "list.hoverBackground": "#F2F2F2", - "list.focusAndSelectionOutline": "#005FB8", - "menu.border": "#CECECE", - "notebook.cellBorderColor": "#E5E5E5", - "notebook.selectedCellBackground": "#C8DDF150", - "notificationCenterHeader.background": "#FFFFFF", - "notificationCenterHeader.foreground": "#3B3B3B", - "notifications.background": "#FFFFFF", - "notifications.border": "#E5E5E5", - "notifications.foreground": "#3B3B3B", - "panel.background": "#F8F8F8", - "panel.border": "#E5E5E5", - "panelInput.border": "#E5E5E5", - "panelTitle.activeBorder": "#005FB8", - "panelTitle.activeForeground": "#3B3B3B", - "panelTitle.inactiveForeground": "#3B3B3B", - "peekViewEditor.matchHighlightBackground": "#BB800966", - "peekViewResult.background": "#FFFFFF", - "peekViewResult.matchHighlightBackground": "#BB800966", - "pickerGroup.border": "#E5E5E5", - "pickerGroup.foreground": "#8B949E", - "ports.iconRunningProcessForeground": "#369432", - "progressBar.background": "#005FB8", - "quickInput.background": "#F8F8F8", - "quickInput.foreground": "#3B3B3B", - "searchEditor.textInputBorder": "#CECECE", - "settings.dropdownBackground": "#FFFFFF", - "settings.dropdownBorder": "#CECECE", - "settings.headerForeground": "#1F1F1F", - "settings.modifiedItemIndicator": "#BB800966", - "settings.numberInputBorder": "#CECECE", - "settings.textInputBorder": "#CECECE", - "sideBar.background": "#F8F8F8", - "sideBar.border": "#E5E5E5", - "sideBar.foreground": "#3B3B3B", - "sideBarSectionHeader.background": "#F8F8F8", - "sideBarSectionHeader.border": "#E5E5E5", - "sideBarSectionHeader.foreground": "#3B3B3B", - "sideBarTitle.foreground": "#3B3B3B", - "statusBar.background": "#F8F8F8", - "statusBar.foreground": "#3B3B3B", - "statusBar.border": "#E5E5E5", - "statusBar.debuggingBackground": "#FD716C", - "statusBar.debuggingForeground": "#000000", - "statusBar.focusBorder": "#005FB8", - "statusBar.noFolderBackground": "#F8F8F8", - "statusBarItem.errorBackground": "#C72E0F", - "statusBarItem.focusBorder": "#005FB8", - "statusBarItem.prominentBackground": "#6E768166", - "statusBarItem.remoteBackground": "#005FB8", - "statusBarItem.remoteForeground": "#FFFFFF", - "tab.activeBackground": "#FFFFFF", - "tab.activeBorder": "#F8F8F8", - "tab.activeBorderTop": "#005FB8", - "tab.activeForeground": "#3B3B3B", - "tab.border": "#E5E5E5", - "tab.hoverBackground": "#FFFFFF", - "tab.inactiveBackground": "#F8F8F8", - "tab.inactiveForeground": "#868686", - "tab.lastPinnedBorder": "#D4D4D4", - "tab.unfocusedActiveBorder": "#F8F8F8", - "tab.unfocusedActiveBorderTop": "#E5E5E5", - "tab.unfocusedHoverBackground": "#F8F8F8", - "terminalCursor.foreground": "#005FB8", - "terminal.foreground": "#3B3B3B", - "terminal.inactiveSelectionBackground": "#E5EBF1", - "terminal.tab.activeBorder": "#005FB8", - "textBlockQuote.background": "#F8F8F8", - "textBlockQuote.border": "#E5E5E5", - "textCodeBlock.background": "#F8F8F8", - "textLink.activeForeground": "#005FB8", - "textLink.foreground": "#005FB8", - "textPreformat.foreground": "#3B3B3B", - "textPreformat.background": "#0000001F", - "textSeparator.foreground": "#21262D", - "titleBar.activeBackground": "#F8F8F8", - "titleBar.activeForeground": "#1E1E1E", - "titleBar.border": "#E5E5E5", - "titleBar.inactiveBackground": "#F8F8F8", - "titleBar.inactiveForeground": "#8B949E", - "welcomePage.tileBackground": "#F3F3F3", - "widget.border": "#E5E5E5" - } + "$schema": "vscode://schemas/color-theme", + "name": "Default Light Modern", + "include": "./light_plus.json", + "colors": { + "activityBar.activeBorder": "#005FB8", + "activityBar.background": "#F8F8F8", + "activityBar.border": "#E5E5E5", + "activityBar.foreground": "#1F1F1F", + "activityBar.inactiveForeground": "#616161", + "activityBarBadge.background": "#005FB8", + "activityBarBadge.foreground": "#FFFFFF", + "badge.background": "#CCCCCC", + "badge.foreground": "#3B3B3B", + "button.background": "#005FB8", + "button.border": "#0000001a", + "button.foreground": "#FFFFFF", + "button.hoverBackground": "#0258A8", + "button.secondaryBackground": "#E5E5E5", + "button.secondaryForeground": "#3B3B3B", + "button.secondaryHoverBackground": "#CCCCCC", + "chat.slashCommandBackground": "#D2ECFF", + "chat.slashCommandForeground": "#306CA2", + "checkbox.background": "#F8F8F8", + "checkbox.border": "#CECECE", + "descriptionForeground": "#3B3B3B", + "dropdown.background": "#FFFFFF", + "dropdown.border": "#CECECE", + "dropdown.foreground": "#3B3B3B", + "dropdown.listBackground": "#FFFFFF", + "editor.background": "#FFFFFF", + "editor.foreground": "#3B3B3B", + "editor.inactiveSelectionBackground": "#E5EBF1", + "editor.selectionHighlightBackground": "#ADD6FF80", + "editorGroup.border": "#E5E5E5", + "editorGroupHeader.tabsBackground": "#F8F8F8", + "editorGroupHeader.tabsBorder": "#E5E5E5", + "editorGutter.addedBackground": "#2EA043", + "editorGutter.deletedBackground": "#F85149", + "editorGutter.modifiedBackground": "#005FB8", + "editorIndentGuide.background1": "#D3D3D3", + "editorLineNumber.activeForeground": "#171184", + "editorLineNumber.foreground": "#6E7681", + "editorOverviewRuler.border": "#E5E5E5", + "editorSuggestWidget.background": "#F8F8F8", + "editorWidget.background": "#F8F8F8", + "errorForeground": "#F85149", + "focusBorder": "#005FB8", + "foreground": "#3B3B3B", + "icon.foreground": "#3B3B3B", + "input.background": "#FFFFFF", + "input.border": "#CECECE", + "input.foreground": "#3B3B3B", + "input.placeholderForeground": "#767676", + "inputOption.activeBackground": "#BED6ED", + "inputOption.activeBorder": "#005FB8", + "inputOption.activeForeground": "#000000", + "keybindingLabel.foreground": "#3B3B3B", + "list.activeSelectionBackground": "#E8E8E8", + "list.activeSelectionForeground": "#000000", + "list.activeSelectionIconForeground": "#000000", + "list.hoverBackground": "#F2F2F2", + "list.focusAndSelectionOutline": "#005FB8", + "menu.border": "#CECECE", + "notebook.cellBorderColor": "#E5E5E5", + "notebook.selectedCellBackground": "#C8DDF150", + "notificationCenterHeader.background": "#FFFFFF", + "notificationCenterHeader.foreground": "#3B3B3B", + "notifications.background": "#FFFFFF", + "notifications.border": "#E5E5E5", + "notifications.foreground": "#3B3B3B", + "panel.background": "#F8F8F8", + "panel.border": "#E5E5E5", + "panelInput.border": "#E5E5E5", + "panelTitle.activeBorder": "#005FB8", + "panelTitle.activeForeground": "#3B3B3B", + "panelTitle.inactiveForeground": "#3B3B3B", + "peekViewEditor.matchHighlightBackground": "#BB800966", + "peekViewResult.background": "#FFFFFF", + "peekViewResult.matchHighlightBackground": "#BB800966", + "pickerGroup.border": "#E5E5E5", + "pickerGroup.foreground": "#8B949E", + "ports.iconRunningProcessForeground": "#369432", + "progressBar.background": "#005FB8", + "quickInput.background": "#F8F8F8", + "quickInput.foreground": "#3B3B3B", + "searchEditor.textInputBorder": "#CECECE", + "settings.dropdownBackground": "#FFFFFF", + "settings.dropdownBorder": "#CECECE", + "settings.headerForeground": "#1F1F1F", + "settings.modifiedItemIndicator": "#BB800966", + "settings.numberInputBorder": "#CECECE", + "settings.textInputBorder": "#CECECE", + "sideBar.background": "#F8F8F8", + "sideBar.border": "#E5E5E5", + "sideBar.foreground": "#3B3B3B", + "sideBarSectionHeader.background": "#F8F8F8", + "sideBarSectionHeader.border": "#E5E5E5", + "sideBarSectionHeader.foreground": "#3B3B3B", + "sideBarTitle.foreground": "#3B3B3B", + "statusBar.background": "#F8F8F8", + "statusBar.foreground": "#3B3B3B", + "statusBar.border": "#E5E5E5", + "statusBar.debuggingBackground": "#FD716C", + "statusBar.debuggingForeground": "#000000", + "statusBar.focusBorder": "#005FB8", + "statusBar.noFolderBackground": "#F8F8F8", + "statusBarItem.errorBackground": "#C72E0F", + "statusBarItem.focusBorder": "#005FB8", + "statusBarItem.prominentBackground": "#6E768166", + "statusBarItem.remoteBackground": "#005FB8", + "statusBarItem.remoteForeground": "#FFFFFF", + "tab.activeBackground": "#FFFFFF", + "tab.activeBorder": "#F8F8F8", + "tab.activeBorderTop": "#005FB8", + "tab.activeForeground": "#3B3B3B", + "tab.border": "#E5E5E5", + "tab.hoverBackground": "#FFFFFF", + "tab.inactiveBackground": "#F8F8F8", + "tab.inactiveForeground": "#868686", + "tab.lastPinnedBorder": "#D4D4D4", + "tab.unfocusedActiveBorder": "#F8F8F8", + "tab.unfocusedActiveBorderTop": "#E5E5E5", + "tab.unfocusedHoverBackground": "#F8F8F8", + "terminalCursor.foreground": "#005FB8", + "terminal.foreground": "#3B3B3B", + "terminal.inactiveSelectionBackground": "#E5EBF1", + "terminal.tab.activeBorder": "#005FB8", + "textBlockQuote.background": "#F8F8F8", + "textBlockQuote.border": "#E5E5E5", + "textCodeBlock.background": "#F8F8F8", + "textLink.activeForeground": "#005FB8", + "textLink.foreground": "#005FB8", + "textPreformat.foreground": "#3B3B3B", + "textPreformat.background": "#0000001F", + "textSeparator.foreground": "#21262D", + "titleBar.activeBackground": "#F8F8F8", + "titleBar.activeForeground": "#1E1E1E", + "titleBar.border": "#E5E5E5", + "titleBar.inactiveBackground": "#F8F8F8", + "titleBar.inactiveForeground": "#8B949E", + "welcomePage.tileBackground": "#F3F3F3", + "widget.border": "#E5E5E5" + } } diff --git a/src/integrations/theme/default-themes/light_plus.json b/src/integrations/theme/default-themes/light_plus.json index cb7fb77..e103f48 100644 --- a/src/integrations/theme/default-themes/light_plus.json +++ b/src/integrations/theme/default-themes/light_plus.json @@ -1,194 +1,194 @@ { - "$schema": "vscode://schemas/color-theme", - "name": "Light+", - "include": "./light_vs.json", - "tokenColors": [ - { - "name": "Function declarations", - "scope": [ - "entity.name.function", - "support.function", - "support.constant.handlebars", - "source.powershell variable.other.member", - "entity.name.operator.custom-literal" - ], - "settings": { - "foreground": "#795E26" - } - }, - { - "name": "Types declaration and references", - "scope": [ - "support.class", - "support.type", - "entity.name.type", - "entity.name.namespace", - "entity.other.attribute", - "entity.name.scope-resolution", - "entity.name.class", - "storage.type.numeric.go", - "storage.type.byte.go", - "storage.type.boolean.go", - "storage.type.string.go", - "storage.type.uintptr.go", - "storage.type.error.go", - "storage.type.rune.go", - "storage.type.cs", - "storage.type.generic.cs", - "storage.type.modifier.cs", - "storage.type.variable.cs", - "storage.type.annotation.java", - "storage.type.generic.java", - "storage.type.java", - "storage.type.object.array.java", - "storage.type.primitive.array.java", - "storage.type.primitive.java", - "storage.type.token.java", - "storage.type.groovy", - "storage.type.annotation.groovy", - "storage.type.parameters.groovy", - "storage.type.generic.groovy", - "storage.type.object.array.groovy", - "storage.type.primitive.array.groovy", - "storage.type.primitive.groovy" - ], - "settings": { - "foreground": "#267f99" - } - }, - { - "name": "Types declaration and references, TS grammar specific", - "scope": [ - "meta.type.cast.expr", - "meta.type.new.expr", - "support.constant.math", - "support.constant.dom", - "support.constant.json", - "entity.other.inherited-class" - ], - "settings": { - "foreground": "#267f99" - } - }, - { - "name": "Control flow / Special keywords", - "scope": [ - "keyword.control", - "source.cpp keyword.operator.new", - "source.cpp keyword.operator.delete", - "keyword.other.using", - "keyword.other.directive.using", - "keyword.other.operator", - "entity.name.operator" - ], - "settings": { - "foreground": "#AF00DB" - } - }, - { - "name": "Variable and parameter name", - "scope": [ - "variable", - "meta.definition.variable.name", - "support.variable", - "entity.name.variable", - "constant.other.placeholder" - ], - "settings": { - "foreground": "#001080" - } - }, - { - "name": "Constants and enums", - "scope": ["variable.other.constant", "variable.other.enummember"], - "settings": { - "foreground": "#0070C1" - } - }, - { - "name": "Object keys, TS grammar specific", - "scope": ["meta.object-literal.key"], - "settings": { - "foreground": "#001080" - } - }, - { - "name": "CSS property value", - "scope": [ - "support.constant.property-value", - "support.constant.font-name", - "support.constant.media-type", - "support.constant.media", - "constant.other.color.rgb-value", - "constant.other.rgb-value", - "support.constant.color" - ], - "settings": { - "foreground": "#0451a5" - } - }, - { - "name": "Regular expression groups", - "scope": [ - "punctuation.definition.group.regexp", - "punctuation.definition.group.assertion.regexp", - "punctuation.definition.character-class.regexp", - "punctuation.character.set.begin.regexp", - "punctuation.character.set.end.regexp", - "keyword.operator.negation.regexp", - "support.other.parenthesis.regexp" - ], - "settings": { - "foreground": "#d16969" - } - }, - { - "scope": [ - "constant.character.character-class.regexp", - "constant.other.character-class.set.regexp", - "constant.other.character-class.regexp", - "constant.character.set.regexp" - ], - "settings": { - "foreground": "#811f3f" - } - }, - { - "scope": "keyword.operator.quantifier.regexp", - "settings": { - "foreground": "#000000" - } - }, - { - "scope": ["keyword.operator.or.regexp", "keyword.control.anchor.regexp"], - "settings": { - "foreground": "#EE0000" - } - }, - { - "scope": ["constant.character", "constant.other.option"], - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "constant.character.escape", - "settings": { - "foreground": "#EE0000" - } - }, - { - "scope": "entity.name.label", - "settings": { - "foreground": "#000000" - } - } - ], - "semanticHighlighting": true, - "semanticTokenColors": { - "newOperator": "#AF00DB", - "stringLiteral": "#a31515", - "customLiteral": "#795E26", - "numberLiteral": "#098658" - } + "$schema": "vscode://schemas/color-theme", + "name": "Light+", + "include": "./light_vs.json", + "tokenColors": [ + { + "name": "Function declarations", + "scope": [ + "entity.name.function", + "support.function", + "support.constant.handlebars", + "source.powershell variable.other.member", + "entity.name.operator.custom-literal" + ], + "settings": { + "foreground": "#795E26" + } + }, + { + "name": "Types declaration and references", + "scope": [ + "support.class", + "support.type", + "entity.name.type", + "entity.name.namespace", + "entity.other.attribute", + "entity.name.scope-resolution", + "entity.name.class", + "storage.type.numeric.go", + "storage.type.byte.go", + "storage.type.boolean.go", + "storage.type.string.go", + "storage.type.uintptr.go", + "storage.type.error.go", + "storage.type.rune.go", + "storage.type.cs", + "storage.type.generic.cs", + "storage.type.modifier.cs", + "storage.type.variable.cs", + "storage.type.annotation.java", + "storage.type.generic.java", + "storage.type.java", + "storage.type.object.array.java", + "storage.type.primitive.array.java", + "storage.type.primitive.java", + "storage.type.token.java", + "storage.type.groovy", + "storage.type.annotation.groovy", + "storage.type.parameters.groovy", + "storage.type.generic.groovy", + "storage.type.object.array.groovy", + "storage.type.primitive.array.groovy", + "storage.type.primitive.groovy" + ], + "settings": { + "foreground": "#267f99" + } + }, + { + "name": "Types declaration and references, TS grammar specific", + "scope": [ + "meta.type.cast.expr", + "meta.type.new.expr", + "support.constant.math", + "support.constant.dom", + "support.constant.json", + "entity.other.inherited-class" + ], + "settings": { + "foreground": "#267f99" + } + }, + { + "name": "Control flow / Special keywords", + "scope": [ + "keyword.control", + "source.cpp keyword.operator.new", + "source.cpp keyword.operator.delete", + "keyword.other.using", + "keyword.other.directive.using", + "keyword.other.operator", + "entity.name.operator" + ], + "settings": { + "foreground": "#AF00DB" + } + }, + { + "name": "Variable and parameter name", + "scope": [ + "variable", + "meta.definition.variable.name", + "support.variable", + "entity.name.variable", + "constant.other.placeholder" + ], + "settings": { + "foreground": "#001080" + } + }, + { + "name": "Constants and enums", + "scope": ["variable.other.constant", "variable.other.enummember"], + "settings": { + "foreground": "#0070C1" + } + }, + { + "name": "Object keys, TS grammar specific", + "scope": ["meta.object-literal.key"], + "settings": { + "foreground": "#001080" + } + }, + { + "name": "CSS property value", + "scope": [ + "support.constant.property-value", + "support.constant.font-name", + "support.constant.media-type", + "support.constant.media", + "constant.other.color.rgb-value", + "constant.other.rgb-value", + "support.constant.color" + ], + "settings": { + "foreground": "#0451a5" + } + }, + { + "name": "Regular expression groups", + "scope": [ + "punctuation.definition.group.regexp", + "punctuation.definition.group.assertion.regexp", + "punctuation.definition.character-class.regexp", + "punctuation.character.set.begin.regexp", + "punctuation.character.set.end.regexp", + "keyword.operator.negation.regexp", + "support.other.parenthesis.regexp" + ], + "settings": { + "foreground": "#d16969" + } + }, + { + "scope": [ + "constant.character.character-class.regexp", + "constant.other.character-class.set.regexp", + "constant.other.character-class.regexp", + "constant.character.set.regexp" + ], + "settings": { + "foreground": "#811f3f" + } + }, + { + "scope": "keyword.operator.quantifier.regexp", + "settings": { + "foreground": "#000000" + } + }, + { + "scope": ["keyword.operator.or.regexp", "keyword.control.anchor.regexp"], + "settings": { + "foreground": "#EE0000" + } + }, + { + "scope": ["constant.character", "constant.other.option"], + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": "constant.character.escape", + "settings": { + "foreground": "#EE0000" + } + }, + { + "scope": "entity.name.label", + "settings": { + "foreground": "#000000" + } + } + ], + "semanticHighlighting": true, + "semanticTokenColors": { + "newOperator": "#AF00DB", + "stringLiteral": "#a31515", + "customLiteral": "#795E26", + "numberLiteral": "#098658" + } } diff --git a/src/integrations/theme/default-themes/light_vs.json b/src/integrations/theme/default-themes/light_vs.json index ac4365a..eb098e3 100644 --- a/src/integrations/theme/default-themes/light_vs.json +++ b/src/integrations/theme/default-themes/light_vs.json @@ -1,422 +1,416 @@ { - "$schema": "vscode://schemas/color-theme", - "name": "Light (Visual Studio)", - "colors": { - "checkbox.border": "#919191", - "editor.background": "#FFFFFF", - "editor.foreground": "#000000", - "editor.inactiveSelectionBackground": "#E5EBF1", - "editorIndentGuide.background1": "#D3D3D3", - "editorIndentGuide.activeBackground1": "#939393", - "editor.selectionHighlightBackground": "#ADD6FF80", - "editorSuggestWidget.background": "#F3F3F3", - "activityBarBadge.background": "#007ACC", - "sideBarTitle.foreground": "#6F6F6F", - "list.hoverBackground": "#E8E8E8", - "menu.border": "#D4D4D4", - "input.placeholderForeground": "#767676", - "searchEditor.textInputBorder": "#CECECE", - "settings.textInputBorder": "#CECECE", - "settings.numberInputBorder": "#CECECE", - "statusBarItem.remoteForeground": "#FFF", - "statusBarItem.remoteBackground": "#16825D", - "ports.iconRunningProcessForeground": "#369432", - "sideBarSectionHeader.background": "#0000", - "sideBarSectionHeader.border": "#61616130", - "tab.lastPinnedBorder": "#61616130", - "notebook.cellBorderColor": "#E8E8E8", - "notebook.selectedCellBackground": "#c8ddf150", - "statusBarItem.errorBackground": "#c72e0f", - "list.activeSelectionIconForeground": "#FFF", - "list.focusAndSelectionOutline": "#90C2F9", - "terminal.inactiveSelectionBackground": "#E5EBF1", - "widget.border": "#d4d4d4", - "actionBar.toggledBackground": "#dddddd", - "diffEditor.unchangedRegionBackground": "#f8f8f8" - }, - "tokenColors": [ - { - "scope": [ - "meta.embedded", - "source.groovy.embedded", - "string meta.image.inline.markdown", - "variable.legacy.builtin.python" - ], - "settings": { - "foreground": "#000000ff" - } - }, - { - "scope": "emphasis", - "settings": { - "fontStyle": "italic" - } - }, - { - "scope": "strong", - "settings": { - "fontStyle": "bold" - } - }, - { - "scope": "meta.diff.header", - "settings": { - "foreground": "#000080" - } - }, - { - "scope": "comment", - "settings": { - "foreground": "#008000" - } - }, - { - "scope": "constant.language", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": [ - "constant.numeric", - "variable.other.enummember", - "keyword.operator.plus.exponent", - "keyword.operator.minus.exponent" - ], - "settings": { - "foreground": "#098658" - } - }, - { - "scope": "constant.regexp", - "settings": { - "foreground": "#811f3f" - } - }, - { - "name": "css tags in selectors, xml tags", - "scope": "entity.name.tag", - "settings": { - "foreground": "#800000" - } - }, - { - "scope": "entity.name.selector", - "settings": { - "foreground": "#800000" - } - }, - { - "scope": "entity.other.attribute-name", - "settings": { - "foreground": "#e50000" - } - }, - { - "scope": [ - "entity.other.attribute-name.class.css", - "source.css entity.other.attribute-name.class", - "entity.other.attribute-name.id.css", - "entity.other.attribute-name.parent-selector.css", - "entity.other.attribute-name.parent.less", - "source.css entity.other.attribute-name.pseudo-class", - "entity.other.attribute-name.pseudo-element.css", - "source.css.less entity.other.attribute-name.id", - "entity.other.attribute-name.scss" - ], - "settings": { - "foreground": "#800000" - } - }, - { - "scope": "invalid", - "settings": { - "foreground": "#cd3131" - } - }, - { - "scope": "markup.underline", - "settings": { - "fontStyle": "underline" - } - }, - { - "scope": "markup.bold", - "settings": { - "fontStyle": "bold", - "foreground": "#000080" - } - }, - { - "scope": "markup.heading", - "settings": { - "fontStyle": "bold", - "foreground": "#800000" - } - }, - { - "scope": "markup.italic", - "settings": { - "fontStyle": "italic" - } - }, - { - "scope": "markup.strikethrough", - "settings": { - "fontStyle": "strikethrough" - } - }, - { - "scope": "markup.inserted", - "settings": { - "foreground": "#098658" - } - }, - { - "scope": "markup.deleted", - "settings": { - "foreground": "#a31515" - } - }, - { - "scope": "markup.changed", - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": [ - "punctuation.definition.quote.begin.markdown", - "punctuation.definition.list.begin.markdown" - ], - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": "markup.inline.raw", - "settings": { - "foreground": "#800000" - } - }, - { - "name": "brackets of XML/HTML tags", - "scope": "punctuation.definition.tag", - "settings": { - "foreground": "#800000" - } - }, - { - "scope": ["meta.preprocessor", "entity.name.function.preprocessor"], - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "meta.preprocessor.string", - "settings": { - "foreground": "#a31515" - } - }, - { - "scope": "meta.preprocessor.numeric", - "settings": { - "foreground": "#098658" - } - }, - { - "scope": "meta.structure.dictionary.key.python", - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": "storage", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "storage.type", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": ["storage.modifier", "keyword.operator.noexcept"], - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": ["string", "meta.embedded.assembly"], - "settings": { - "foreground": "#a31515" - } - }, - { - "scope": [ - "string.comment.buffered.block.pug", - "string.quoted.pug", - "string.interpolated.pug", - "string.unquoted.plain.in.yaml", - "string.unquoted.plain.out.yaml", - "string.unquoted.block.yaml", - "string.quoted.single.yaml", - "string.quoted.double.xml", - "string.quoted.single.xml", - "string.unquoted.cdata.xml", - "string.quoted.double.html", - "string.quoted.single.html", - "string.unquoted.html", - "string.quoted.single.handlebars", - "string.quoted.double.handlebars" - ], - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "string.regexp", - "settings": { - "foreground": "#811f3f" - } - }, - { - "name": "String interpolation", - "scope": [ - "punctuation.definition.template-expression.begin", - "punctuation.definition.template-expression.end", - "punctuation.section.embedded" - ], - "settings": { - "foreground": "#0000ff" - } - }, - { - "name": "Reset JavaScript string interpolation expression", - "scope": ["meta.template.expression"], - "settings": { - "foreground": "#000000" - } - }, - { - "scope": [ - "support.constant.property-value", - "support.constant.font-name", - "support.constant.media-type", - "support.constant.media", - "constant.other.color.rgb-value", - "constant.other.rgb-value", - "support.constant.color" - ], - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": [ - "support.type.vendored.property-name", - "support.type.property-name", - "source.css variable", - "source.coffee.embedded" - ], - "settings": { - "foreground": "#e50000" - } - }, - { - "scope": ["support.type.property-name.json"], - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": "keyword", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "keyword.control", - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "keyword.operator", - "settings": { - "foreground": "#000000" - } - }, - { - "scope": [ - "keyword.operator.new", - "keyword.operator.expression", - "keyword.operator.cast", - "keyword.operator.sizeof", - "keyword.operator.alignof", - "keyword.operator.typeid", - "keyword.operator.alignas", - "keyword.operator.instanceof", - "keyword.operator.logical.python", - "keyword.operator.wordlike" - ], - "settings": { - "foreground": "#0000ff" - } - }, - { - "scope": "keyword.other.unit", - "settings": { - "foreground": "#098658" - } - }, - { - "scope": [ - "punctuation.section.embedded.begin.php", - "punctuation.section.embedded.end.php" - ], - "settings": { - "foreground": "#800000" - } - }, - { - "scope": "support.function.git-rebase", - "settings": { - "foreground": "#0451a5" - } - }, - { - "scope": "constant.sha.git-rebase", - "settings": { - "foreground": "#098658" - } - }, - { - "name": "coloring of the Java import and package identifiers", - "scope": [ - "storage.modifier.import.java", - "variable.language.wildcard.java", - "storage.modifier.package.java" - ], - "settings": { - "foreground": "#000000" - } - }, - { - "name": "this.self", - "scope": "variable.language", - "settings": { - "foreground": "#0000ff" - } - } - ], - "semanticHighlighting": true, - "semanticTokenColors": { - "newOperator": "#0000ff", - "stringLiteral": "#a31515", - "customLiteral": "#000000", - "numberLiteral": "#098658" - } + "$schema": "vscode://schemas/color-theme", + "name": "Light (Visual Studio)", + "colors": { + "checkbox.border": "#919191", + "editor.background": "#FFFFFF", + "editor.foreground": "#000000", + "editor.inactiveSelectionBackground": "#E5EBF1", + "editorIndentGuide.background1": "#D3D3D3", + "editorIndentGuide.activeBackground1": "#939393", + "editor.selectionHighlightBackground": "#ADD6FF80", + "editorSuggestWidget.background": "#F3F3F3", + "activityBarBadge.background": "#007ACC", + "sideBarTitle.foreground": "#6F6F6F", + "list.hoverBackground": "#E8E8E8", + "menu.border": "#D4D4D4", + "input.placeholderForeground": "#767676", + "searchEditor.textInputBorder": "#CECECE", + "settings.textInputBorder": "#CECECE", + "settings.numberInputBorder": "#CECECE", + "statusBarItem.remoteForeground": "#FFF", + "statusBarItem.remoteBackground": "#16825D", + "ports.iconRunningProcessForeground": "#369432", + "sideBarSectionHeader.background": "#0000", + "sideBarSectionHeader.border": "#61616130", + "tab.lastPinnedBorder": "#61616130", + "notebook.cellBorderColor": "#E8E8E8", + "notebook.selectedCellBackground": "#c8ddf150", + "statusBarItem.errorBackground": "#c72e0f", + "list.activeSelectionIconForeground": "#FFF", + "list.focusAndSelectionOutline": "#90C2F9", + "terminal.inactiveSelectionBackground": "#E5EBF1", + "widget.border": "#d4d4d4", + "actionBar.toggledBackground": "#dddddd", + "diffEditor.unchangedRegionBackground": "#f8f8f8" + }, + "tokenColors": [ + { + "scope": [ + "meta.embedded", + "source.groovy.embedded", + "string meta.image.inline.markdown", + "variable.legacy.builtin.python" + ], + "settings": { + "foreground": "#000000ff" + } + }, + { + "scope": "emphasis", + "settings": { + "fontStyle": "italic" + } + }, + { + "scope": "strong", + "settings": { + "fontStyle": "bold" + } + }, + { + "scope": "meta.diff.header", + "settings": { + "foreground": "#000080" + } + }, + { + "scope": "comment", + "settings": { + "foreground": "#008000" + } + }, + { + "scope": "constant.language", + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": [ + "constant.numeric", + "variable.other.enummember", + "keyword.operator.plus.exponent", + "keyword.operator.minus.exponent" + ], + "settings": { + "foreground": "#098658" + } + }, + { + "scope": "constant.regexp", + "settings": { + "foreground": "#811f3f" + } + }, + { + "name": "css tags in selectors, xml tags", + "scope": "entity.name.tag", + "settings": { + "foreground": "#800000" + } + }, + { + "scope": "entity.name.selector", + "settings": { + "foreground": "#800000" + } + }, + { + "scope": "entity.other.attribute-name", + "settings": { + "foreground": "#e50000" + } + }, + { + "scope": [ + "entity.other.attribute-name.class.css", + "source.css entity.other.attribute-name.class", + "entity.other.attribute-name.id.css", + "entity.other.attribute-name.parent-selector.css", + "entity.other.attribute-name.parent.less", + "source.css entity.other.attribute-name.pseudo-class", + "entity.other.attribute-name.pseudo-element.css", + "source.css.less entity.other.attribute-name.id", + "entity.other.attribute-name.scss" + ], + "settings": { + "foreground": "#800000" + } + }, + { + "scope": "invalid", + "settings": { + "foreground": "#cd3131" + } + }, + { + "scope": "markup.underline", + "settings": { + "fontStyle": "underline" + } + }, + { + "scope": "markup.bold", + "settings": { + "fontStyle": "bold", + "foreground": "#000080" + } + }, + { + "scope": "markup.heading", + "settings": { + "fontStyle": "bold", + "foreground": "#800000" + } + }, + { + "scope": "markup.italic", + "settings": { + "fontStyle": "italic" + } + }, + { + "scope": "markup.strikethrough", + "settings": { + "fontStyle": "strikethrough" + } + }, + { + "scope": "markup.inserted", + "settings": { + "foreground": "#098658" + } + }, + { + "scope": "markup.deleted", + "settings": { + "foreground": "#a31515" + } + }, + { + "scope": "markup.changed", + "settings": { + "foreground": "#0451a5" + } + }, + { + "scope": ["punctuation.definition.quote.begin.markdown", "punctuation.definition.list.begin.markdown"], + "settings": { + "foreground": "#0451a5" + } + }, + { + "scope": "markup.inline.raw", + "settings": { + "foreground": "#800000" + } + }, + { + "name": "brackets of XML/HTML tags", + "scope": "punctuation.definition.tag", + "settings": { + "foreground": "#800000" + } + }, + { + "scope": ["meta.preprocessor", "entity.name.function.preprocessor"], + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": "meta.preprocessor.string", + "settings": { + "foreground": "#a31515" + } + }, + { + "scope": "meta.preprocessor.numeric", + "settings": { + "foreground": "#098658" + } + }, + { + "scope": "meta.structure.dictionary.key.python", + "settings": { + "foreground": "#0451a5" + } + }, + { + "scope": "storage", + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": "storage.type", + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": ["storage.modifier", "keyword.operator.noexcept"], + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": ["string", "meta.embedded.assembly"], + "settings": { + "foreground": "#a31515" + } + }, + { + "scope": [ + "string.comment.buffered.block.pug", + "string.quoted.pug", + "string.interpolated.pug", + "string.unquoted.plain.in.yaml", + "string.unquoted.plain.out.yaml", + "string.unquoted.block.yaml", + "string.quoted.single.yaml", + "string.quoted.double.xml", + "string.quoted.single.xml", + "string.unquoted.cdata.xml", + "string.quoted.double.html", + "string.quoted.single.html", + "string.unquoted.html", + "string.quoted.single.handlebars", + "string.quoted.double.handlebars" + ], + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": "string.regexp", + "settings": { + "foreground": "#811f3f" + } + }, + { + "name": "String interpolation", + "scope": [ + "punctuation.definition.template-expression.begin", + "punctuation.definition.template-expression.end", + "punctuation.section.embedded" + ], + "settings": { + "foreground": "#0000ff" + } + }, + { + "name": "Reset JavaScript string interpolation expression", + "scope": ["meta.template.expression"], + "settings": { + "foreground": "#000000" + } + }, + { + "scope": [ + "support.constant.property-value", + "support.constant.font-name", + "support.constant.media-type", + "support.constant.media", + "constant.other.color.rgb-value", + "constant.other.rgb-value", + "support.constant.color" + ], + "settings": { + "foreground": "#0451a5" + } + }, + { + "scope": [ + "support.type.vendored.property-name", + "support.type.property-name", + "source.css variable", + "source.coffee.embedded" + ], + "settings": { + "foreground": "#e50000" + } + }, + { + "scope": ["support.type.property-name.json"], + "settings": { + "foreground": "#0451a5" + } + }, + { + "scope": "keyword", + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": "keyword.control", + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": "keyword.operator", + "settings": { + "foreground": "#000000" + } + }, + { + "scope": [ + "keyword.operator.new", + "keyword.operator.expression", + "keyword.operator.cast", + "keyword.operator.sizeof", + "keyword.operator.alignof", + "keyword.operator.typeid", + "keyword.operator.alignas", + "keyword.operator.instanceof", + "keyword.operator.logical.python", + "keyword.operator.wordlike" + ], + "settings": { + "foreground": "#0000ff" + } + }, + { + "scope": "keyword.other.unit", + "settings": { + "foreground": "#098658" + } + }, + { + "scope": ["punctuation.section.embedded.begin.php", "punctuation.section.embedded.end.php"], + "settings": { + "foreground": "#800000" + } + }, + { + "scope": "support.function.git-rebase", + "settings": { + "foreground": "#0451a5" + } + }, + { + "scope": "constant.sha.git-rebase", + "settings": { + "foreground": "#098658" + } + }, + { + "name": "coloring of the Java import and package identifiers", + "scope": [ + "storage.modifier.import.java", + "variable.language.wildcard.java", + "storage.modifier.package.java" + ], + "settings": { + "foreground": "#000000" + } + }, + { + "name": "this.self", + "scope": "variable.language", + "settings": { + "foreground": "#0000ff" + } + } + ], + "semanticHighlighting": true, + "semanticTokenColors": { + "newOperator": "#0000ff", + "stringLiteral": "#a31515", + "customLiteral": "#000000", + "numberLiteral": "#098658" + } } diff --git a/src/integrations/theme/getTheme.ts b/src/integrations/theme/getTheme.ts index b582999..ffed26e 100644 --- a/src/integrations/theme/getTheme.ts +++ b/src/integrations/theme/getTheme.ts @@ -55,7 +55,7 @@ export async function getTheme() { const filename = `${defaultThemes[colorTheme]}.json` currentTheme = await fs.readFile( path.join(getExtensionUri().fsPath, "src", "integrations", "theme", "default-themes", filename), - "utf-8" + "utf-8", ) } @@ -65,7 +65,7 @@ export async function getTheme() { if (parsed.include) { const includeThemeString = await fs.readFile( path.join(getExtensionUri().fsPath, "src", "integrations", "theme", "default-themes", parsed.include), - "utf-8" + "utf-8", ) const includeTheme = parseThemeString(includeThemeString) parsed = mergeJson(parsed, includeTheme) @@ -77,8 +77,8 @@ export async function getTheme() { ["vs", "hc-black"].includes(converted.base) ? converted.base : colorTheme.includes("Light") - ? "vs" - : "vs-dark" + ? "vs" + : "vs-dark" ) as any return converted @@ -93,7 +93,7 @@ export function mergeJson( first: JsonObject, second: JsonObject, mergeBehavior?: "merge" | "overwrite", - mergeKeys?: { [key: string]: (a: any, b: any) => boolean } + mergeKeys?: { [key: string]: (a: any, b: any) => boolean }, ): any { const copyOfFirst = JSON.parse(JSON.stringify(first)) diff --git a/src/integrations/workspace/WorkspaceTracker.ts b/src/integrations/workspace/WorkspaceTracker.ts index 958dae9..10dfac8 100644 --- a/src/integrations/workspace/WorkspaceTracker.ts +++ b/src/integrations/workspace/WorkspaceTracker.ts @@ -52,7 +52,7 @@ class WorkspaceTracker { await Promise.all( event.files.map(async (file) => { await this.addFilePath(file.fsPath) - }) + }), ) this.workspaceDidUpdate() } @@ -64,7 +64,7 @@ class WorkspaceTracker { if (await this.removeFilePath(file.fsPath)) { updated = true } - }) + }), ) if (updated) { this.workspaceDidUpdate() @@ -76,7 +76,7 @@ class WorkspaceTracker { event.files.map(async (file) => { await this.removeFilePath(file.oldUri.fsPath) await this.addFilePath(file.newUri.fsPath) - }) + }), ) this.workspaceDidUpdate() } diff --git a/src/services/browser/BrowserSession.ts b/src/services/browser/BrowserSession.ts index 9d44c63..b45265c 100644 --- a/src/services/browser/BrowserSession.ts +++ b/src/services/browser/BrowserSession.ts @@ -82,7 +82,7 @@ export class BrowserSession { async doAction(action: (page: Page) => Promise): Promise { if (!this.page) { throw new Error( - "Browser is not launched. This may occur if the browser was automatically closed by a non-`browser_action` tool." + "Browser is not launched. This may occur if the browser was automatically closed by a non-`browser_action` tool.", ) } diff --git a/src/services/ripgrep/index.ts b/src/services/ripgrep/index.ts index 853aa91..b48c60b 100644 --- a/src/services/ripgrep/index.ts +++ b/src/services/ripgrep/index.ts @@ -126,7 +126,7 @@ export async function regexSearchFiles( cwd: string, directoryPath: string, regex: string, - filePattern?: string + filePattern?: string, ): Promise { const vscodeAppRoot = vscode.env.appRoot const rgPath = await getBinPath(vscodeAppRoot) diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index 4ca0ab4..35bee7b 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -1,15 +1,15 @@ -import * as assert from 'assert'; +import * as assert from "assert" // You can import and use all API from the 'vscode' module // as well as import your extension to test it -import * as vscode from 'vscode'; +import * as vscode from "vscode" // import * as myExtension from '../../extension'; -suite('Extension Test Suite', () => { - vscode.window.showInformationMessage('Start all tests.'); +suite("Extension Test Suite", () => { + vscode.window.showInformationMessage("Start all tests.") - test('Sample test', () => { - assert.strictEqual(-1, [1, 2, 3].indexOf(5)); - assert.strictEqual(-1, [1, 2, 3].indexOf(0)); - }); -}); + test("Sample test", () => { + assert.strictEqual(-1, [1, 2, 3].indexOf(5)) + assert.strictEqual(-1, [1, 2, 3].indexOf(0)) + }) +}) diff --git a/src/utils/cost.ts b/src/utils/cost.ts index 6a777d8..f8f5f2b 100644 --- a/src/utils/cost.ts +++ b/src/utils/cost.ts @@ -5,7 +5,7 @@ export function calculateApiCost( inputTokens: number, outputTokens: number, cacheCreationInputTokens?: number, - cacheReadInputTokens?: number + cacheReadInputTokens?: number, ): number { const modelCacheWritesPrice = modelInfo.cacheWritesPrice let cacheWritesCost = 0 diff --git a/webview-ui/package.json b/webview-ui/package.json index afc8b13..cc5beb6 100644 --- a/webview-ui/package.json +++ b/webview-ui/package.json @@ -1,57 +1,57 @@ { - "name": "webview-ui", - "version": "0.1.0", - "private": true, - "dependencies": { - "@testing-library/jest-dom": "^5.17.0", - "@testing-library/react": "^13.4.0", - "@testing-library/user-event": "^13.5.0", - "@types/jest": "^27.5.2", - "@types/node": "^16.18.101", - "@types/react": "^18.3.3", - "@types/react-dom": "^18.3.0", - "@vscode/webview-ui-toolkit": "^1.4.0", - "debounce": "^2.1.1", - "fast-deep-equal": "^3.1.3", - "fuse.js": "^7.0.0", - "react": "^18.3.1", - "react-dom": "^18.3.1", - "react-remark": "^2.1.0", - "react-scripts": "5.0.1", - "react-textarea-autosize": "^8.5.3", - "react-use": "^17.5.1", - "react-virtuoso": "^4.7.13", - "rehype-highlight": "^7.0.0", - "rewire": "^7.0.0", - "styled-components": "^6.1.13", - "typescript": "^4.9.5", - "web-vitals": "^2.1.4" - }, - "scripts": { - "start": "react-scripts start", - "build": "node ./scripts/build-react-no-split.js", - "test": "react-scripts test", - "eject": "react-scripts eject" - }, - "eslintConfig": { - "extends": [ - "react-app", - "react-app/jest" - ] - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] - }, - "devDependencies": { - "@types/vscode-webview": "^1.57.5" - } + "name": "webview-ui", + "version": "0.1.0", + "private": true, + "dependencies": { + "@testing-library/jest-dom": "^5.17.0", + "@testing-library/react": "^13.4.0", + "@testing-library/user-event": "^13.5.0", + "@types/jest": "^27.5.2", + "@types/node": "^16.18.101", + "@types/react": "^18.3.3", + "@types/react-dom": "^18.3.0", + "@vscode/webview-ui-toolkit": "^1.4.0", + "debounce": "^2.1.1", + "fast-deep-equal": "^3.1.3", + "fuse.js": "^7.0.0", + "react": "^18.3.1", + "react-dom": "^18.3.1", + "react-remark": "^2.1.0", + "react-scripts": "5.0.1", + "react-textarea-autosize": "^8.5.3", + "react-use": "^17.5.1", + "react-virtuoso": "^4.7.13", + "rehype-highlight": "^7.0.0", + "rewire": "^7.0.0", + "styled-components": "^6.1.13", + "typescript": "^4.9.5", + "web-vitals": "^2.1.4" + }, + "scripts": { + "start": "react-scripts start", + "build": "node ./scripts/build-react-no-split.js", + "test": "react-scripts test", + "eject": "react-scripts eject" + }, + "eslintConfig": { + "extends": [ + "react-app", + "react-app/jest" + ] + }, + "browserslist": { + "production": [ + ">0.2%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + }, + "devDependencies": { + "@types/vscode-webview": "^1.57.5" + } } diff --git a/webview-ui/public/index.html b/webview-ui/public/index.html index ed1fb15..bd3562a 100644 --- a/webview-ui/public/index.html +++ b/webview-ui/public/index.html @@ -1,20 +1,17 @@ - + - - - - - - - - - - React App - - - -
- - + --> diff --git a/webview-ui/public/manifest.json b/webview-ui/public/manifest.json index 145eb1a..918a3f8 100644 --- a/webview-ui/public/manifest.json +++ b/webview-ui/public/manifest.json @@ -1,25 +1,25 @@ { - "short_name": "React App", - "name": "Create React App Sample", - "icons": [ - { - "src": "", - "sizes": "64x64 32x32 24x24 16x16", - "type": "image/x-icon" - }, - { - "src": "", - "type": "image/png", - "sizes": "192x192" - }, - { - "src": "", - "type": "image/png", - "sizes": "512x512" - } - ], - "start_url": ".", - "display": "standalone", - "theme_color": "#000000", - "background_color": "#ffffff" + "short_name": "React App", + "name": "Create React App Sample", + "icons": [ + { + "src": "", + "sizes": "64x64 32x32 24x24 16x16", + "type": "image/x-icon" + }, + { + "src": "", + "type": "image/png", + "sizes": "192x192" + }, + { + "src": "", + "type": "image/png", + "sizes": "512x512" + } + ], + "start_url": ".", + "display": "standalone", + "theme_color": "#000000", + "background_color": "#ffffff" } diff --git a/webview-ui/src/components/chat/BrowserSessionRow.tsx b/webview-ui/src/components/chat/BrowserSessionRow.tsx index 8b7ec4e..dec573e 100644 --- a/webview-ui/src/components/chat/BrowserSessionRow.tsx +++ b/webview-ui/src/components/chat/BrowserSessionRow.tsx @@ -91,7 +91,7 @@ const BrowserSessionRow = memo((props: BrowserSessionRowProps) => { nextActionMessages.length > 0 ? { messages: [...nextActionMessages], - } + } : undefined, }) @@ -121,7 +121,7 @@ const BrowserSessionRow = memo((props: BrowserSessionRowProps) => { nextActionMessages.length > 0 ? { messages: [...nextActionMessages], - } + } : undefined, }) } @@ -167,13 +167,13 @@ const BrowserSessionRow = memo((props: BrowserSessionRowProps) => { mousePosition: currentPage?.currentState.mousePosition || latestState.mousePosition || "700,400", consoleLogs: currentPage?.currentState.consoleLogs, screenshot: currentPage?.currentState.screenshot || latestState.screenshot, - } + } : { url: currentPage?.currentState.url || initialUrl, mousePosition: currentPage?.currentState.mousePosition || "700,400", consoleLogs: currentPage?.currentState.consoleLogs, screenshot: currentPage?.currentState.screenshot, - } + } const [actionContent, { height: actionHeight }] = useSize(
@@ -188,7 +188,7 @@ const BrowserSessionRow = memo((props: BrowserSessionRowProps) => { {!isBrowsing && messages.some((m) => m.say === "browser_action_result") && currentPageIndex === 0 && ( )} -
+ , ) useEffect(() => { @@ -381,7 +381,7 @@ const BrowserSessionRow = memo((props: BrowserSessionRowProps) => { )} - + , ) // Height change effect diff --git a/webview-ui/src/components/chat/ChatRow.tsx b/webview-ui/src/components/chat/ChatRow.tsx index 12d3ade..9d0063f 100644 --- a/webview-ui/src/components/chat/ChatRow.tsx +++ b/webview-ui/src/components/chat/ChatRow.tsx @@ -35,7 +35,7 @@ const ChatRow = memo( padding: "10px 6px 10px 15px", }}> - + , ) useEffect(() => { @@ -55,7 +55,7 @@ const ChatRow = memo( return chatrow }, // memo does shallow comparison of props, so we need to do deep comparison of arrays/objects whose properties might change - deepEqual + deepEqual, ) export default ChatRow @@ -707,9 +707,7 @@ export const ChatRowContent = ({ padding: `2px 8px ${isExpanded ? 0 : 8}px 8px`, }}> + className={`codicon codicon-chevron-${isExpanded ? "down" : "right"}`}> Command Output {isExpanded && } diff --git a/webview-ui/src/components/chat/ChatTextArea.tsx b/webview-ui/src/components/chat/ChatTextArea.tsx index 9dff842..f465942 100644 --- a/webview-ui/src/components/chat/ChatTextArea.tsx +++ b/webview-ui/src/components/chat/ChatTextArea.tsx @@ -40,7 +40,7 @@ const ChatTextArea = forwardRef( shouldDisableImages, onHeightChange, }, - ref + ref, ) => { const { filePaths } = useExtensionState() const [isTextAreaFocused, setIsTextAreaFocused] = useState(false) @@ -119,7 +119,7 @@ const ChatTextArea = forwardRef( const { newValue, mentionIndex } = insertMention( textAreaRef.current.value, cursorPosition, - insertValue + insertValue, ) setInputValue(newValue) @@ -137,7 +137,7 @@ const ChatTextArea = forwardRef( }, 0) } }, - [setInputValue, cursorPosition] + [setInputValue, cursorPosition], ) const handleKeyDown = useCallback( @@ -163,14 +163,14 @@ const ChatTextArea = forwardRef( const selectableOptions = options.filter( (option) => option.type !== ContextMenuOptionType.URL && - option.type !== ContextMenuOptionType.NoResults + option.type !== ContextMenuOptionType.NoResults, ) if (selectableOptions.length === 0) return -1 // No selectable options // Find the index of the next selectable option const currentSelectableIndex = selectableOptions.findIndex( - (option) => option === options[prevIndex] + (option) => option === options[prevIndex], ) const newSelectableIndex = @@ -252,7 +252,7 @@ const ChatTextArea = forwardRef( setInputValue, justDeletedSpaceAfterMention, queryItems, - ] + ], ) useLayoutEffect(() => { @@ -285,7 +285,7 @@ const ChatTextArea = forwardRef( setSelectedMenuIndex(-1) } }, - [setInputValue] + [setInputValue], ) useEffect(() => { @@ -370,7 +370,7 @@ const ChatTextArea = forwardRef( } } }, - [shouldDisableImages, setSelectedImages, cursorPosition, setInputValue, inputValue] + [shouldDisableImages, setSelectedImages, cursorPosition, setInputValue, inputValue], ) const handleThumbnailsHeightChange = useCallback((height: number) => { @@ -394,7 +394,7 @@ const ChatTextArea = forwardRef( highlightLayerRef.current.innerHTML = text .replace(/\n$/, "\n\n") - .replace(/[<>&]/g, (c) => ({ "<": "<", ">": ">", "&": "&" }[c] || c)) + .replace(/[<>&]/g, (c) => ({ "<": "<", ">": ">", "&": "&" })[c] || c) .replace(mentionRegexGlobal, '$&') highlightLayerRef.current.scrollTop = textAreaRef.current.scrollTop @@ -417,7 +417,7 @@ const ChatTextArea = forwardRef( updateCursorPosition() } }, - [updateCursorPosition] + [updateCursorPosition], ) return ( @@ -594,7 +594,7 @@ const ChatTextArea = forwardRef( ) - } + }, ) export default ChatTextArea diff --git a/webview-ui/src/components/chat/ChatView.tsx b/webview-ui/src/components/chat/ChatView.tsx index 56fdede..abdcec7 100644 --- a/webview-ui/src/components/chat/ChatView.tsx +++ b/webview-ui/src/components/chat/ChatView.tsx @@ -271,7 +271,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie disableAutoScrollRef.current = false } }, - [messages.length, clineAsk] + [messages.length, clineAsk], ) const startNewTask = useCallback(() => { @@ -365,7 +365,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie const newImages = message.images ?? [] if (newImages.length > 0) { setSelectedImages((prevImages) => - [...prevImages, ...newImages].slice(0, MAX_IMAGES_PER_MESSAGE) + [...prevImages, ...newImages].slice(0, MAX_IMAGES_PER_MESSAGE), ) } break @@ -391,7 +391,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie handleSendMessage, handlePrimaryButtonClick, handleSecondaryButtonClick, - ] + ], ) useEvent("message", handleMessage) @@ -529,9 +529,9 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie }) }, 10, - { immediate: true } + { immediate: true }, ), - [] + [], ) const scrollToBottomAuto = useCallback(() => { @@ -593,7 +593,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie } } }, - [groupedMessages, expandedRows, scrollToBottomAuto, isAtBottom] + [groupedMessages, expandedRows, scrollToBottomAuto, isAtBottom], ) const handleRowHeightChange = useCallback( @@ -608,7 +608,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie } } }, - [scrollToBottomSmooth, scrollToBottomAuto] + [scrollToBottomSmooth, scrollToBottomAuto], ) useEffect(() => { @@ -671,7 +671,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie /> ) }, - [expandedRows, modifiedMessages, groupedMessages.length, toggleRowExpansion, handleRowHeightChange] + [expandedRows, modifiedMessages, groupedMessages.length, toggleRowExpansion, handleRowHeightChange], ) return ( diff --git a/webview-ui/src/components/chat/ContextMenu.tsx b/webview-ui/src/components/chat/ContextMenu.tsx index 6da9558..81a3047 100644 --- a/webview-ui/src/components/chat/ContextMenu.tsx +++ b/webview-ui/src/components/chat/ContextMenu.tsx @@ -25,7 +25,7 @@ const ContextMenu: React.FC = ({ const filteredOptions = useMemo( () => getContextMenuOptions(searchQuery, selectedType, queryItems), - [searchQuery, selectedType, queryItems] + [searchQuery, selectedType, queryItems], ) useEffect(() => { diff --git a/webview-ui/src/components/common/CodeAccordian.tsx b/webview-ui/src/components/common/CodeAccordian.tsx index eb2bd58..36f8fbc 100644 --- a/webview-ui/src/components/common/CodeAccordian.tsx +++ b/webview-ui/src/components/common/CodeAccordian.tsx @@ -35,7 +35,7 @@ const CodeAccordian = ({ }: CodeAccordianProps) => { const inferredLanguage = useMemo( () => code && (language ?? (path ? getLanguageFromPath(path) : undefined)), - [path, language, code] + [path, language, code], ) return ( diff --git a/webview-ui/src/components/common/CodeBlock.tsx b/webview-ui/src/components/common/CodeBlock.tsx index 314a66f..b00f641 100644 --- a/webview-ui/src/components/common/CodeBlock.tsx +++ b/webview-ui/src/components/common/CodeBlock.tsx @@ -69,8 +69,19 @@ const StyledMarkdown = styled.div<{ forceWrap: boolean }>` } background-color: ${CODE_BLOCK_BG_COLOR}; - font-family: var(--vscode-font-family), system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, - Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; + font-family: + var(--vscode-font-family), + system-ui, + -apple-system, + BlinkMacSystemFont, + "Segoe UI", + Roboto, + Oxygen, + Ubuntu, + Cantarell, + "Open Sans", + "Helvetica Neue", + sans-serif; font-size: var(--vscode-editor-font-size, var(--vscode-font-size, 12px)); color: var(--vscode-editor-foreground, #fff); diff --git a/webview-ui/src/components/common/Demo.tsx b/webview-ui/src/components/common/Demo.tsx index 8d6dc89..6efd7e3 100644 --- a/webview-ui/src/components/common/Demo.tsx +++ b/webview-ui/src/components/common/Demo.tsx @@ -1,24 +1,23 @@ - import { - VSCodeBadge, - VSCodeButton, - VSCodeCheckbox, - VSCodeDataGrid, - VSCodeDataGridCell, - VSCodeDataGridRow, - VSCodeDivider, - VSCodeDropdown, - VSCodeLink, - VSCodeOption, - VSCodePanels, - VSCodePanelTab, - VSCodePanelView, - VSCodeProgressRing, - VSCodeRadio, - VSCodeRadioGroup, - VSCodeTag, - VSCodeTextArea, - VSCodeTextField, + VSCodeBadge, + VSCodeButton, + VSCodeCheckbox, + VSCodeDataGrid, + VSCodeDataGridCell, + VSCodeDataGridRow, + VSCodeDivider, + VSCodeDropdown, + VSCodeLink, + VSCodeOption, + VSCodePanels, + VSCodePanelTab, + VSCodePanelView, + VSCodeProgressRing, + VSCodeRadio, + VSCodeRadioGroup, + VSCodeTag, + VSCodeTextArea, + VSCodeTextField, } from "@vscode/webview-ui-toolkit/react" function Demo() { @@ -81,7 +80,7 @@ function Demo() { ))} - +
diff --git a/webview-ui/src/components/common/MarkdownBlock.tsx b/webview-ui/src/components/common/MarkdownBlock.tsx index 55565d1..d1033ea 100644 --- a/webview-ui/src/components/common/MarkdownBlock.tsx +++ b/webview-ui/src/components/common/MarkdownBlock.tsx @@ -57,8 +57,19 @@ const StyledMarkdown = styled.div` overflow-wrap: anywhere; } - font-family: var(--vscode-font-family), system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, - Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; + font-family: + var(--vscode-font-family), + system-ui, + -apple-system, + BlinkMacSystemFont, + "Segoe UI", + Roboto, + Oxygen, + Ubuntu, + Cantarell, + "Open Sans", + "Helvetica Neue", + sans-serif; font-size: var(--vscode-font-size, 13px); p, diff --git a/webview-ui/src/components/history/HistoryView.tsx b/webview-ui/src/components/history/HistoryView.tsx index e29d7bf..14b97c6 100644 --- a/webview-ui/src/components/history/HistoryView.tsx +++ b/webview-ui/src/components/history/HistoryView.tsx @@ -430,7 +430,7 @@ const ExportButton = ({ itemId }: { itemId: string }) => ( // https://gist.github.com/evenfrost/1ba123656ded32fb7a0cd4651efd4db0 export const highlight = ( fuseSearchResult: FuseResult[], - highlightClassName: string = "history-item-highlight" + highlightClassName: string = "history-item-highlight", ) => { const set = (obj: Record, path: string, value: any) => { const pathValue = path.split(".") diff --git a/webview-ui/src/components/settings/OpenRouterModelPicker.tsx b/webview-ui/src/components/settings/OpenRouterModelPicker.tsx index c84aadb..bd4efd8 100644 --- a/webview-ui/src/components/settings/OpenRouterModelPicker.tsx +++ b/webview-ui/src/components/settings/OpenRouterModelPicker.tsx @@ -266,8 +266,19 @@ const DropdownItem = styled.div<{ isSelected: boolean }>` // Markdown const StyledMarkdown = styled.div` - font-family: var(--vscode-font-family), system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, - Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; + font-family: + var(--vscode-font-family), + system-ui, + -apple-system, + BlinkMacSystemFont, + "Segoe UI", + Roboto, + Oxygen, + Ubuntu, + Cantarell, + "Open Sans", + "Helvetica Neue", + sans-serif; font-size: 12px; color: var(--vscode-descriptionForeground); @@ -403,5 +414,5 @@ export const ModelDescriptionMarkdown = memo( )} */} ) - } + }, ) diff --git a/webview-ui/src/context/ExtensionStateContext.tsx b/webview-ui/src/context/ExtensionStateContext.tsx index 5409dd6..e60a265 100644 --- a/webview-ui/src/context/ExtensionStateContext.tsx +++ b/webview-ui/src/context/ExtensionStateContext.tsx @@ -57,7 +57,7 @@ export const ExtensionStateContextProvider: React.FC<{ children: React.ReactNode config.lmStudioModelId, config.geminiApiKey, config.openAiNativeApiKey, - ].some((key) => key !== undefined) + ].some((key) => key !== undefined) : false setShowWelcome(!hasKey) setDidHydrateState(true) diff --git a/webview-ui/src/index.tsx b/webview-ui/src/index.tsx index df65d89..934a81f 100644 --- a/webview-ui/src/index.tsx +++ b/webview-ui/src/index.tsx @@ -9,7 +9,7 @@ const root = ReactDOM.createRoot(document.getElementById("root") as HTMLElement) root.render( - + , ) // If you want to start measuring performance in your app, pass a function diff --git a/webview-ui/src/utils/context-mentions.ts b/webview-ui/src/utils/context-mentions.ts index a5fb420..a79aefb 100644 --- a/webview-ui/src/utils/context-mentions.ts +++ b/webview-ui/src/utils/context-mentions.ts @@ -3,7 +3,7 @@ import { mentionRegex } from "../../../src/shared/context-mentions" export function insertMention( text: string, position: number, - value: string + value: string, ): { newValue: string; mentionIndex: number } { const beforeCursor = text.slice(0, position) const afterCursor = text.slice(position) @@ -62,7 +62,7 @@ export interface ContextMenuQueryItem { export function getContextMenuOptions( query: string, selectedType: ContextMenuOptionType | null = null, - queryItems: ContextMenuQueryItem[] + queryItems: ContextMenuQueryItem[], ): ContextMenuQueryItem[] { if (query === "") { if (selectedType === ContextMenuOptionType.File) { diff --git a/webview-ui/src/utils/textMateToHljs.ts b/webview-ui/src/utils/textMateToHljs.ts index 589a43b..cf44464 100644 --- a/webview-ui/src/utils/textMateToHljs.ts +++ b/webview-ui/src/utils/textMateToHljs.ts @@ -100,7 +100,7 @@ function fallbackTheme() { ".hljs-string": "#a31515", ".hljs-meta .hljs-string": "#a31515", ".hljs-params": "#001080", - } + } : { ".hljs-comment": "#6A9955", ".hljs-doctag": "#569cd6", @@ -128,7 +128,7 @@ function fallbackTheme() { ".hljs-string": "#ce9178", ".hljs-meta .hljs-string": "#ce9178", ".hljs-params": "#9CDCFE", - } + } } export function convertTextMateToHljs(fullColorTheme: any) { diff --git a/webview-ui/src/utils/validate.ts b/webview-ui/src/utils/validate.ts index df21fb1..437e126 100644 --- a/webview-ui/src/utils/validate.ts +++ b/webview-ui/src/utils/validate.ts @@ -59,7 +59,7 @@ export function validateApiConfiguration(apiConfiguration?: ApiConfiguration): s export function validateModelId( apiConfiguration?: ApiConfiguration, - openRouterModels?: Record + openRouterModels?: Record, ): string | undefined { if (apiConfiguration) { switch (apiConfiguration.apiProvider) {