Refactor the code completion parser and instructions to use a new, standardized markdown heading format for file path and cursor position

Author: robertpiosik

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/clipboard-parser.spec.ts

@@ -792,7 +792,7 @@ describe('clipboard-parser', () => {
         file_path: 'src/index.ts',
         line: 25,
         character: 5,
-        content: 'console.log("completion");'
+        content: load_test_case_file(test_case, '1-file.txt')
       })
     })
 
@@ -814,11 +814,11 @@ describe('clipboard-parser', () => {
         file_path: 'src/index.ts',
         line: 25,
         character: 5,
-        content: 'console.log("completion");'
+        content: load_test_case_file(test_case, '2-file.txt')
       })
       expect(result[2]).toMatchObject({
         type: 'text',
-        content: load_test_case_file(test_case, '2-text.txt')
+        content: load_test_case_file(test_case, '3-text.txt')
       })
     })
 

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/parsers/code-completion-parser.ts

@@ -8,7 +8,8 @@ import {
 const extract_path_and_position = (
   line: string
 ): { path: string; line: number; character: number } | null => {
-  const path_pos_regex = /\/\/\s*"?([^"<>\s?*|:]+)"?\s+(\d+):(\d+)/
+  const path_pos_regex =
+    /###\s+Code completion:\s+`?([^`]+)`?\s+\((\d+):(\d+)\)/
 
   const match = line.match(path_pos_regex)
 
@@ -57,15 +58,25 @@ export const parse_code_completion = (params: {
     code_block_end_index = lines.length - 1
   }
 
-  const first_line_of_block = lines[code_block_start_index + 1]
-  const completion_info = extract_path_and_position(first_line_of_block)
+  let header_index = -1
+  let completion_info = null
+
+  for (let k = code_block_start_index - 1; k >= 0; k--) {
+    if (lines[k].trim() === '') continue
+    const info = extract_path_and_position(lines[k])
+    if (info) {
+      header_index = k
+      completion_info = info
+    }
+    break
+  }
 
   if (!completion_info) {
     return null
   }
 
   const results: (CompletionItem | TextItem)[] = []
-  const text_before = lines.slice(0, code_block_start_index).join('\n').trim()
+  const text_before = lines.slice(0, header_index).join('\n').trim()
   if (text_before) {
     results.push({ type: 'text', content: text_before })
   }
@@ -76,7 +87,7 @@ export const parse_code_completion = (params: {
   })
 
   const content_lines = lines.slice(
-    code_block_start_index + 2,
+    code_block_start_index + 1,
     code_block_end_index
   )
 

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/code-completion-with-text/2-file.txt

@@ -0,0 +1 @@
+console.log("completion");

…ses/code-completion-with-text/2-text.txt …ses/code-completion-with-text/3-text.txtpackages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/code-completion-with-text/2-text.txt renamed to packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/code-completion-with-text/3-text.txt packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/code-completion-with-text/2-text.txt renamed to packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/code-completion-with-text/3-text.txt

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

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/code-completion-with-text/code-completion-with-text.txt

@@ -0,0 +1 @@
+console.log("completion");

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/code-completion/1-file.txt

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

packages/vscode/src/commands/apply-chat-response-command/utils/clipboard-parser/test-cases/code-completion/code-completion.txt

@@ -251,7 +251,6 @@ export async function handle_workspace_state_source(
                 internal_contexts
               )
               vscode.window.showInformationMessage(
-                // NOSONAR
                 dictionary.information_message.RESTORED_CONTEXT(
                   deleted_context_name
                 )

packages/vscode/src/commands/apply-context-command/sources/workspace-state-source.ts

@@ -224,7 +224,6 @@ export const checkpoints_command = (params: {
               )
             if (!temp_checkpoint) {
               vscode.window.showErrorMessage(
-                // NOSONAR
                 dictionary.error_message
                   .COULD_NOT_FIND_TEMP_CHECKPOINT_TO_REVERT
               )
@@ -274,7 +273,6 @@ export const checkpoints_command = (params: {
             if (confirmation == 'Clear All') {
               await clear_all_checkpoints(params.context, params.panel_provider)
               vscode.window.showInformationMessage(
-                // NOSONAR
                 dictionary.information_message.ALL_CHECKPOINTS_CLEARED
               )
             }

packages/vscode/src/commands/checkpoints-command/checkpoints-command.ts

@@ -1,16 +1,23 @@
 export const code_completion_instructions =
-  'Find correct replacement for the <missing_text> symbol. Respond with replacement text within "replacement" XML tags, without explanations or any other text.'
+  'Find correct replacement for the <missing_text> symbol. Respond with replacement text within "replacement" XML tags, without explanations or any other text.\nExample:\n<replacement>!== undefined</replacement>\n'
 
 export const code_completion_instructions_for_panel = (
   file_path: string,
   row: number,
   column: number
 ) =>
-  `Find correct replacement text for the <missing_text> symbol. Your response must begin with a Markdown Code Block containing the replacement text, followed by an explanation. The first line of the Markdown Code Block must be: "// ${file_path} ${
+  `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}\` (${
     row + 1
   }:${
     column + 1
-  }". Always refer to the symbol "<missing_text>" as "cursor position" and "replacement" as "completion".`
+  })". Always refer to the symbol "<missing_text>" as "cursor position" and "replacement" as "completion". Example:\n### Code completion: \`src/index.ts\` (25:5)
+\`\`\`typescript
+!== undefined
+\`\`\`
+The variable is possibly not defined.
+</system>`
 
 export const intelligent_update_instructions =
   "Refactor the file according to the attached changes without explanations or any other text. Print the file in full because I have a disability which means I can't type and need to be able to just copy and paste."