feat: merge upstream branch

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 (
  <div className="settings__item">
  <div className="settings__item_title">OpenAI API Key</div>
@@ -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>
@@ -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() {

src/features/chat/promptUtils.ts

@@ -3,10 +3,6 @@ import {
  getContentsIfNeeded,
  getPathForFileId,
  getPathForFolderId,
-<<<<<<< HEAD
- getContentsIfNeeded,
-=======
->>>>>>> main
 } from '../window/fileUtils'
 import { FullState } from '../window/state'
 import { joinAdvanced } from '../../utils'

src/features/linter/fixLSPExtension.ts

@@ -2,11 +2,7 @@ import { StateEffect, StateField, Text } from '@codemirror/state'
 
 import { setDiff } from '../extensions/diff'
 import { EditorView } from '@codemirror/view'
-<<<<<<< HEAD
-import { getDiagnostics, lintState, activeLintField } from './lint'
-=======
 import { activeLintField, getDiagnostics, lintState } from './lint'
->>>>>>> main
 import { LineChange } from '../window/state'
 
 // Define the resetLineNumbers effect

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() {

src/preload.ts

@@ -416,7 +416,7 @@ const electronConnector = {
  },
  registerCloseErrors(callback: Callback) {
  ipcRenderer.on('closeErrors', callback)
- }
+ },
 }
 
 contextBridge.exposeInMainWorld('connector', electronConnector)