Skip to content

Commit

Permalink
Add: Vue.js syntax support (#335)
Browse files Browse the repository at this point in the history
* feat: update codemirror & support VueJs

* feat: update lock file

* feat: code prettier

* fix: fix conflicts

* feat: format code

* feat: merge upstream branch
  • Loading branch information
boxizen committed Apr 6, 2023
1 parent 49b0ee1 commit d8f7fdf
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 34 deletions.
68 changes: 61 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -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",
Expand Down
49 changes: 25 additions & 24 deletions src/components/settingsPane.tsx
Expand Up @@ -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])
Expand Down Expand Up @@ -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 (
<div className="settings__item">
<div className="settings__item_title">OpenAI API Key</div>
Expand Down Expand Up @@ -485,34 +486,36 @@ export function CursorLogin({
<div className="copilot__signin">
<button onClick={signOut}>Log out</button>
{showSettings && (
<>
<br />
<button onClick={openAccountSettings}>
Manage settings
</button>
</>
)}
<>
<br />
<button onClick={openAccountSettings}>
Manage settings
</button>
</>
)}
</div>
</div>
)
} else {
currentPanel = (
<>
<div className="settings__item">
<div className="settings__item_title">Cursor Account</div>
<div className="settings__item_title">
Cursor Account
</div>
<div className="settings__item_description">
Login to use the AI without an API key
</div>
<div className="copilot__signin">
<button onClick={signOut}>Log out</button>
{showSettings && (
<>
<br />
<button onClick={openAccountSettings}>
Manage settings
</button>
</>
)}
<>
<br />
<button onClick={openAccountSettings}>
Manage settings
</button>
</>
)}
<br />
</div>
</div>
Expand All @@ -522,17 +525,15 @@ export function CursorLogin({
Upgrade for unlimited generations
</div>
<div className="copilot__signin">
<button onClick={upgrade}>Upgrade to Pro</button>
<button onClick={upgrade}>Upgrade to Pro</button>
</div>
</div>
</>
)
}
}

return (
currentPanel
)
return currentPanel
}

function CopilotPanel() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/auth.ts
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion src/preload.ts
Expand Up @@ -416,7 +416,7 @@ const electronConnector = {
},
registerCloseErrors(callback: Callback) {
ipcRenderer.on('closeErrors', callback)
}
},
}

contextBridge.exposeInMainWorld('connector', electronConnector)
Expand Down

0 comments on commit d8f7fdf

Please sign in to comment.