Rename "code completion" to "code at cursor" across all related files and functionality

Author: robertpiosik

apps/editor/src/commands/apply-chat-response-command/apply-chat-response-command.ts

@@ -136,7 +136,7 @@ export const apply_chat_response_command = (params: {
             (item) =>
               item.type == 'diff' ||
               item.type == 'file' ||
-              item.type == 'completion'
+              item.type == 'code-at-cursor'
           )
 
         if (has_content_to_preview) {

apps/editor/src/commands/apply-chat-response-command/response-processor.ts

@@ -322,9 +322,9 @@ export const process_chat_response = async (
 
     return null
   } else {
-    if (clipboard_items.some((item) => item.type == 'completion')) {
+    if (clipboard_items.some((item) => item.type == 'code-at-cursor')) {
       const completion = clipboard_items.find(
-        (item) => item.type == 'completion'
+        (item) => item.type == 'code-at-cursor'
       )!
       const workspace_map = new Map<string, string>()
       vscode.workspace.workspaceFolders!.forEach((folder) => {

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/clipboard-parser.spec.ts

@@ -1120,7 +1120,7 @@ describe('clipboard-parser', () => {
 
       expect(result).toHaveLength(1)
       expect(result[0]).toMatchObject({
-        type: 'completion',
+        type: 'code-at-cursor',
         file_path: 'src/index.ts',
         line: 25,
         character: 5,
@@ -1146,7 +1146,7 @@ describe('clipboard-parser', () => {
         content: load_test_case_file('completions', test_case, '1-text.txt')
       })
       expect(result[1]).toMatchObject({
-        type: 'completion',
+        type: 'code-at-cursor',
         file_path: 'src/index.ts',
         line: 25,
         character: 5,

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/clipboard-parser.ts

@@ -1,6 +1,6 @@
 import {
   extract_diffs,
-  parse_code_completion,
+  parse_code_at_cursor,
   parse_multiple_files,
   parse_relevant_files
 } from './parsers'
@@ -22,8 +22,8 @@ export type DiffItem = {
   new_file_path?: string
 }
 
-export type CompletionItem = {
-  type: 'completion'
+export type CodeAtCursorItem = {
+  type: 'code-at-cursor'
   file_path: string
   content: string
   line: number
@@ -50,7 +50,7 @@ export type InlineFileItem = {
 export type ClipboardItem =
   | FileItem
   | DiffItem
-  | CompletionItem
+  | CodeAtCursorItem
   | TextItem
   | InlineFileItem
   | RelevantFilesItem
@@ -82,13 +82,13 @@ export const parse_response = (params: {
   const is_single_root_folder_workspace =
     params.is_single_root_folder_workspace ?? true
 
-  const code_completion_items = parse_code_completion({
+  const code_at_cursor_items = parse_code_at_cursor({
     response: params.response,
     is_single_root_folder_workspace
   })
 
-  if (code_completion_items && code_completion_items.length > 0) {
-    return code_completion_items
+  if (code_at_cursor_items && code_at_cursor_items.length > 0) {
+    return code_at_cursor_items
   }
 
   const relevant_files = parse_relevant_files({ response: params.response })

…parser/parsers/code-completion-parser.ts …-parser/parsers/code-at-cursor-parser.tsapps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/code-completion-parser.ts renamed to apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/code-at-cursor-parser.ts apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/code-completion-parser.ts renamed to apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/code-at-cursor-parser.ts

@@ -1,15 +1,14 @@
 import { cleanup_api_response } from '@/utils/cleanup-api-response'
 import {
-  CompletionItem,
+  CodeAtCursorItem,
   TextItem,
   extract_workspace_and_path
 } from '../clipboard-parser'
 
 const extract_path_and_position = (
   line: string
 ): { path: string; line: number; character: number } | null => {
-  const path_pos_regex =
-    /###\s+Code completion:\s+`?([^`]+)`?\s+\((\d+):(\d+)\)/
+  const path_pos_regex = /###\s+Code at cursor:\s+`?([^`]+)`?\s+\((\d+):(\d+)\)/
 
   const match = line.match(path_pos_regex)
 
@@ -29,10 +28,10 @@ const extract_path_and_position = (
   return null
 }
 
-export const parse_code_completion = (params: {
+export const parse_code_at_cursor = (params: {
   response: string
   is_single_root_folder_workspace: boolean
-}): (CompletionItem | TextItem)[] | null => {
+}): (CodeAtCursorItem | TextItem)[] | null => {
   const lines = params.response.split('\n')
   let code_block_start_index = -1
   let code_block_end_index = -1
@@ -75,7 +74,7 @@ export const parse_code_completion = (params: {
     return null
   }
 
-  const results: (CompletionItem | TextItem)[] = []
+  const results: (CodeAtCursorItem | TextItem)[] = []
   const text_before = lines.slice(0, header_index).join('\n').trim()
   if (text_before) {
     results.push({ type: 'text', content: text_before })
@@ -92,7 +91,7 @@ export const parse_code_completion = (params: {
   )
 
   results.push({
-    type: 'completion',
+    type: 'code-at-cursor',
     file_path: relative_path,
     content: cleanup_api_response({ content: content_lines.join('\n') }),
     line: completion_info.line,

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/index.ts

@@ -1,4 +1,4 @@
-export * from './code-completion-parser'
+export * from './code-at-cursor-parser'
 export * from './file-content-only-parser'
 export * from './multiple-files-parser/multiple-files-parser'
 export * from './diff-parser/diff-parser'

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/completions/code-completion-with-text/code-completion-with-text.txt

@@ -1,6 +1,6 @@
 Some text before.
 
-### Code completion: `src/index.ts` (25:5)
+### Code at cursor: `src/index.ts` (25:5)
 
 ```typescript
 console.log("completion");

apps/editor/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/completions/code-completion/code-completion.txt

@@ -1,4 +1,4 @@
-### Code completion: `src/index.ts` (25:5)
+### Code at cursor: `src/index.ts` (25:5)
 
 ```typescript
 console.log("completion");

apps/editor/src/commands/apply-chat-response-command/utils/preview/preview.ts

@@ -94,7 +94,7 @@ export const preview = async (params: {
         } else if (
           item.type == 'file' ||
           item.type == 'diff' ||
-          item.type == 'completion'
+          item.type == 'code-at-cursor'
         ) {
           const key = is_single_root_folder_workspace
             ? item.file_path

apps/editor/src/constants/instructions.ts

@@ -8,13 +8,13 @@ export const code_at_cursor_instructions_for_panel = (
 ) =>
   `Find correct replacement text for the <missing_text> symbol.
 <system>
-Your response must begin with a markdown heading identifying the file and the cursor position, followed by a markdown code block containing the replacement text, followed by a brief explanation. The heading must be: "### Code completion: \`${file_path}\` (${
+Your response must begin with a markdown heading identifying the file and the cursor position, followed by a markdown code block containing the replacement text, followed by a brief explanation. The heading must be: "### Code at cursor: \`${file_path}\` (${
     row + 1
   }:${
     column + 1
   })". Always refer to the symbol "<missing_text>" as "cursor position" and "replacement" as "completion". Example:
 
-### Code completion: \`${file_path}\` (${row + 1}:${column + 1})
+### Code at cursor: \`${file_path}\` (${row + 1}:${column + 1})
 
 \`\`\`typescript
 !== undefined