Merge branch 'main' of github.com:getcursor/cursor

package.json

@@ -170,6 +170,7 @@
  "uuid": "^9.0.0",
  "watcher": "^2.2.2",
  "webpack": "^5.75.0",
- "xterm": "^4.19.0"
+ "xterm": "^4.19.0",
+ "xterm-addon-web-links": "^0.6.0"
  }
 }

src/appComponent.tsx

@@ -10,7 +10,6 @@ import Modal from 'react-modal'
 
 import { useAppSelector, useAppDispatch } from './app/hooks'
 import { PaneHolder } from './components/pane'
-import { LeftSide } from './components/search'
 import * as gs from './features/globalSlice'
 import * as cs from './features/chat/chatSlice'
 import * as ct from './features/chat/chatThunks'
@@ -31,7 +30,7 @@ import _ from 'lodash'
 
 import { ChatPopup, CommandBar } from './components/markdown'
 import { SettingsPopup } from './components/settingsPane'
-import { FeedbackArea } from './components/search'
+import { FeedbackArea, LeftSide } from './components/search'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { WelcomeScreen } from './components/welcomeScreen'
 import { TitleBar } from './components/titlebar'

src/components/terminal.tsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useRef } from 'react'
 import { Terminal } from 'xterm'
 import { FitAddon } from 'xterm-addon-fit'
+import { WebLinksAddon } from 'xterm-addon-web-links';
 import 'xterm/css/xterm.css'
 import { useAppSelector, useAppDispatch } from '../app/hooks'
 import { FullState } from '../features/window/state'
@@ -13,6 +14,12 @@ export function XTermComponent({ height }: { height: number }) {
  const terminalRef = useRef<HTMLDivElement>(null)
  const terminal = useRef<Terminal | null>(null)
  const fitAddon = useRef<FitAddon>(new FitAddon())
+ const webLinksAddon = useRef<WebLinksAddon>(new WebLinksAddon(
+ (event: MouseEvent, url: string) => {
+ event.preventDefault()
+ connector.terminalClickLink(url)
+ },
+ ))
 
  const handleIncomingData = (e: any, data: any) => {
  terminal.current!.write(data)
@@ -30,6 +37,7 @@ export function XTermComponent({ height }: { height: number }) {
  })
 
  terminal.current.loadAddon(fitAddon.current)
+ terminal.current.loadAddon(webLinksAddon.current)
 
  if (terminalRef.current) {
  terminal.current.open(terminalRef.current)
@@ -41,6 +49,11 @@ export function XTermComponent({ height }: { height: number }) {
  connector.terminalInto(e)
  })
 
+ terminal.current.onData((e) => {
+ connector.terminalInto(e)
+ })
+
+
  connector.registerIncData(handleIncomingData)
 
  // Make the terminal's size and geometry fit the size of #terminal-container
@@ -55,6 +68,7 @@ export function XTermComponent({ height }: { height: number }) {
  useEffect(() => {
  if (terminal.current != null) {
  terminal.current.loadAddon(fitAddon.current)
+ terminal.current.loadAddon(webLinksAddon.current)
  fitAddon.current.fit()
  }
  }, [height, terminal, fitAddon])

src/features/chat/chatSlice.ts

@@ -108,7 +108,7 @@ export const chatSlice = createSlice({
  useDiagnostics?: boolean | number
  }>
  ) {
- chatState.chatIsOpen = true
+//  chatState.chatIsOpen = true
 
  const lastUserMessage = chatState.userMessages.at(-1)!
  const type = action.payload.type

src/main/lsp.ts

@@ -28,6 +28,7 @@ import {
 import log from 'electron-log'
 import Store from 'electron-store'
 import fixPath from 'fix-path'
+import { fileSystem } from './fileSystem'
 
 const writeFilePromise = promisify(fs.writeFile)
 const lspDir = app.isPackaged
@@ -360,6 +361,10 @@ class LSPManager {
  case 'go':
  const goDir = path.join(lspDir, 'go')
  try {
+ // Check $GOPATH, and remove $GOPATH/go.mod file
+ const goPath = cp.execSync('echo $GOPATH').toString().trim()
+ fs.accessSync(`${goPath}go.mod`, fs.constants.F_OK)
+ await fileSystem.unlinkSync(`${goPath}/go.mod`)
  await promisify(cp.exec)(
  'go install golang.org/x/tools/gopls@latest',
  {

src/main/main.ts

@@ -906,6 +906,12 @@ const createWindow = () => {
  }
  return null
  })
+
+ // click on the terminal link
+ ipcMain.handle('terminal-click-link', (event, data) => {
+ shell.openExternal(data);
+ })
+
  setupLSPs(store)
  const projectPathObj = store.get('projectPath')
  if (

src/preload.ts

@@ -189,6 +189,7 @@ const electronConnector = {
  ipcRenderer.removeListener('terminal-incData', callback)
  },
  terminalInto: (data: any) => ipcRenderer.invoke('terminal-into', data),
+ terminalClickLink: (data: any) => ipcRenderer.invoke('terminal-click-link', data),
  terminalResize: (data: any) => ipcRenderer.invoke('terminal-resize', data),
 
  registerFileWasAdded: (callback: Callback) =>

src/utils.ts

@@ -2,7 +2,7 @@ export const API_ROOT = 'https://aicursor.com'
 
 export class NoAuthRateLimitError extends Error {
  constructor(
- message: string = 'You have reached the rate limit for unauthenticated requests. Please authenticate to continue.'
+ message = 'You have reached the rate limit for unauthenticated requests. Please authenticate to continue.'
  ) {
  super(message)
  this.name = 'NoAuthRateLimitError'
@@ -11,7 +11,7 @@ export class NoAuthRateLimitError extends Error {
 
 export class AuthRateLimitError extends Error {
  constructor(
- message: string = 'You have reached the rate limit for authenticated requests. Please wait before making more requests.'
+ message = 'You have reached the rate limit for authenticated requests. Please wait before making more requests.'
  ) {
  super(message)
  this.name = 'AuthRateLimitError'