From d8f7fdf3e73b95d85ed98204755748dee3ebf7e7 Mon Sep 17 00:00:00 2001 From: Box Tsang Date: Thu, 6 Apr 2023 13:01:35 +0800 Subject: [PATCH] Add: Vue.js syntax support (#335) * feat: update codemirror & support VueJs * feat: update lock file * feat: code prettier * fix: fix conflicts * feat: format code * feat: merge upstream branch --- package-lock.json | 68 +++++++++++++++++++++++++++++---- package.json | 2 +- src/components/settingsPane.tsx | 49 ++++++++++++------------ src/main/auth.ts | 2 +- src/preload.ts | 2 +- 5 files changed, 89 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index e0bdeef..619aab1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -23,7 +23,7 @@ "@codemirror/lang-rust": "^6.0.1", "@codemirror/lang-sql": "^6.3.3", "@codemirror/language": "^6.3.1", - "@codemirror/language-data": "^6.1.0", + "@codemirror/language-data": "^6.2.0", "@codemirror/merge": "^0.1.3", "@codemirror/search": "^6.2.3", "@codemirror/state": "^6.2.0", @@ -1906,6 +1906,18 @@ "@lezer/common": "^1.0.0" } }, + "node_modules/@codemirror/lang-angular": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@codemirror/lang-angular/-/lang-angular-0.1.0.tgz", + "integrity": "sha512-vTjoHjzJmLrrMFmf/tojwp+O0P+R9mgWtjjaKDNDoY58PzOPg7ldMEBqIzABBc+/2mYPD85SG7O5byfBxc83eA==", + "dependencies": { + "@codemirror/lang-html": "^6.0.0", + "@codemirror/lang-javascript": "^6.1.2", + "@codemirror/language": "^6.0.0", + "@lezer/common": "^1.0.0", + "@lezer/highlight": "^1.0.0" + } + }, "node_modules/@codemirror/lang-cpp": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/@codemirror/lang-cpp/-/lang-cpp-6.0.2.tgz", @@ -2030,6 +2042,19 @@ "@lezer/lr": "^1.0.0" } }, + "node_modules/@codemirror/lang-vue": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@codemirror/lang-vue/-/lang-vue-0.1.1.tgz", + "integrity": "sha512-GIfc/MemCFKUdNSYGTFZDN8XsD2z0DUY7DgrK34on0dzdZ/CawZbi+SADYfVzWoPPdxngHzLhqlR5pSOqyPCvA==", + "dependencies": { + "@codemirror/lang-html": "^6.0.0", + "@codemirror/lang-javascript": "^6.1.2", + "@codemirror/language": "^6.0.0", + "@lezer/common": "^1.0.0", + "@lezer/highlight": "^1.0.0", + "@lezer/lr": "^1.3.1" + } + }, "node_modules/@codemirror/lang-wast": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/@codemirror/lang-wast/-/lang-wast-6.0.1.tgz", @@ -2066,10 +2091,11 @@ } }, "node_modules/@codemirror/language-data": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.1.0.tgz", - "integrity": "sha512-g9V23fuLRI9AEbpM6bDy1oquqgpFlIDHTihUhL21NPmxp+x67ZJbsKk+V71W7/Bj8SCqEO1PtqQA/tDGgt1nfw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.2.0.tgz", + "integrity": "sha512-X0k33cmGmhdBVjKABgVtF6dH+zC0ODjLbCHCciY4kGimGX0hr7aui9+upj0Fumu8nr9ggQ36xLAR0EQ1JktKhw==", "dependencies": { + "@codemirror/lang-angular": "^0.1.0", "@codemirror/lang-cpp": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-html": "^6.0.0", @@ -2081,6 +2107,7 @@ "@codemirror/lang-python": "^6.0.0", "@codemirror/lang-rust": "^6.0.0", "@codemirror/lang-sql": "^6.0.0", + "@codemirror/lang-vue": "^0.1.1", "@codemirror/lang-wast": "^6.0.0", "@codemirror/lang-xml": "^6.0.0", "@codemirror/language": "^6.0.0", @@ -22863,6 +22890,18 @@ "@lezer/common": "^1.0.0" } }, + "@codemirror/lang-angular": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@codemirror/lang-angular/-/lang-angular-0.1.0.tgz", + "integrity": "sha512-vTjoHjzJmLrrMFmf/tojwp+O0P+R9mgWtjjaKDNDoY58PzOPg7ldMEBqIzABBc+/2mYPD85SG7O5byfBxc83eA==", + "requires": { + "@codemirror/lang-html": "^6.0.0", + "@codemirror/lang-javascript": "^6.1.2", + "@codemirror/language": "^6.0.0", + "@lezer/common": "^1.0.0", + "@lezer/highlight": "^1.0.0" + } + }, "@codemirror/lang-cpp": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/@codemirror/lang-cpp/-/lang-cpp-6.0.2.tgz", @@ -22987,6 +23026,19 @@ "@lezer/lr": "^1.0.0" } }, + "@codemirror/lang-vue": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@codemirror/lang-vue/-/lang-vue-0.1.1.tgz", + "integrity": "sha512-GIfc/MemCFKUdNSYGTFZDN8XsD2z0DUY7DgrK34on0dzdZ/CawZbi+SADYfVzWoPPdxngHzLhqlR5pSOqyPCvA==", + "requires": { + "@codemirror/lang-html": "^6.0.0", + "@codemirror/lang-javascript": "^6.1.2", + "@codemirror/language": "^6.0.0", + "@lezer/common": "^1.0.0", + "@lezer/highlight": "^1.0.0", + "@lezer/lr": "^1.3.1" + } + }, "@codemirror/lang-wast": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/@codemirror/lang-wast/-/lang-wast-6.0.1.tgz", @@ -23023,10 +23075,11 @@ } }, "@codemirror/language-data": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.1.0.tgz", - "integrity": "sha512-g9V23fuLRI9AEbpM6bDy1oquqgpFlIDHTihUhL21NPmxp+x67ZJbsKk+V71W7/Bj8SCqEO1PtqQA/tDGgt1nfw==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/@codemirror/language-data/-/language-data-6.2.0.tgz", + "integrity": "sha512-X0k33cmGmhdBVjKABgVtF6dH+zC0ODjLbCHCciY4kGimGX0hr7aui9+upj0Fumu8nr9ggQ36xLAR0EQ1JktKhw==", "requires": { + "@codemirror/lang-angular": "^0.1.0", "@codemirror/lang-cpp": "^6.0.0", "@codemirror/lang-css": "^6.0.0", "@codemirror/lang-html": "^6.0.0", @@ -23038,6 +23091,7 @@ "@codemirror/lang-python": "^6.0.0", "@codemirror/lang-rust": "^6.0.0", "@codemirror/lang-sql": "^6.0.0", + "@codemirror/lang-vue": "^0.1.1", "@codemirror/lang-wast": "^6.0.0", "@codemirror/lang-xml": "^6.0.0", "@codemirror/language": "^6.0.0", diff --git a/package.json b/package.json index 00bf043..4e8de1b 100644 --- a/package.json +++ b/package.json @@ -87,7 +87,7 @@ "@codemirror/lang-rust": "^6.0.1", "@codemirror/lang-sql": "^6.3.3", "@codemirror/language": "^6.3.1", - "@codemirror/language-data": "^6.1.0", + "@codemirror/language-data": "^6.2.0", "@codemirror/merge": "^0.1.3", "@codemirror/search": "^6.2.3", "@codemirror/state": "^6.2.0", diff --git a/src/components/settingsPane.tsx b/src/components/settingsPane.tsx index a5d393f..8b5fa42 100644 --- a/src/components/settingsPane.tsx +++ b/src/components/settingsPane.tsx @@ -219,8 +219,9 @@ export function OpenAILoginPanel({ onSubmit }: { onSubmit: () => void }) { changeSettings({ openAIKey: localAPIKey, useOpenAIKey: true, - openAIModel: models.at(0) ?? null - })) + openAIModel: models.at(0) ?? null, + }) + ) onSubmit() } }, [dispatch, localAPIKey]) @@ -346,12 +347,12 @@ export function OpenAIPanel() { changeSettings({ openAIKey: localAPIKey, useOpenAIKey: true, - openAIModel: models.at(0) ?? null - })) + openAIModel: models.at(0) ?? null, + }) + ) } }, [dispatch, localAPIKey]) - return (
OpenAI API Key
@@ -485,13 +486,13 @@ export function CursorLogin({
{showSettings && ( - <> -
- - - )} + <> +
+ + + )}
) @@ -499,20 +500,22 @@ export function CursorLogin({ currentPanel = ( <>
-
Cursor Account
+
+ Cursor Account +
Login to use the AI without an API key
{showSettings && ( - <> -
- - - )} + <> +
+ + + )}
@@ -522,7 +525,7 @@ export function CursorLogin({ Upgrade for unlimited generations
- +
@@ -530,9 +533,7 @@ export function CursorLogin({ } } - return ( - currentPanel - ) + return currentPanel } function CopilotPanel() { diff --git a/src/main/auth.ts b/src/main/auth.ts index 7725aea..8ecd3d7 100644 --- a/src/main/auth.ts +++ b/src/main/auth.ts @@ -221,7 +221,7 @@ export async function login() { } export async function signup() { - await shell.openExternal(addRandomQueryParam(signUpUrl)) + await shell.openExternal(addRandomQueryParam(signUpUrl)) } export async function pay() { diff --git a/src/preload.ts b/src/preload.ts index 6c3ef84..c8f2422 100644 --- a/src/preload.ts +++ b/src/preload.ts @@ -416,7 +416,7 @@ const electronConnector = { }, registerCloseErrors(callback: Callback) { ipcRenderer.on('closeErrors', callback) - } + }, } contextBridge.exposeInMainWorld('connector', electronConnector)