Tree sitter improvements

Author: Colin McNeil

functions/tree_sitter/main.js

@@ -33,7 +33,7 @@ const codeContent = fs.readFileSync(args.path, 'utf8');
 // Parse the code using the chosen parser
 const parsed = parser.parse(codeContent);
 
-const line_to_grab = args.line + 1
+const line_to_grab = args.line
 
 if (line_to_grab === undefined) {
     console.log('No line number provided')
@@ -47,9 +47,10 @@ if (line_to_grab > codeContent.split('\n').length) {
 
 // Look for node where node.startPosition.row and node.endPosition.row are equal to line_to_grab
 const search_node = (node) => {
-    if (node.startPosition.row === line_to_grab && node.endPosition.row === line_to_grab) {
+    if (node.startPosition.row === line_to_grab - 1 && node.endPosition.row === line_to_grab - 1) {
         return node
     }
+
     for (const child of node.children) {
         const result = search_node(child)
         if (result) {
@@ -67,20 +68,46 @@ if (!line_node) {
     process.exit(1)
 }
 
-const parent = line_node.parent
-
-if (parent.text.length > 256) {
-    console.log('Parent node text is too long, truncating')
-    const index = parent.text.indexOf(line_node.text)
-    const start = index - 128
-    const end = index + 128
-    parent.text = parent.text.slice(start, end)
+const parseParent = (childNode) => {
+    const parent = childNode.parent
+    if (!parent) {
+        return childNode
+    }
+    const MIN_CONTEXT_LENGTH = 700
+    const MAX_CONTEXT_LENGTH = 1500
+    if (parent.text.length > MAX_CONTEXT_LENGTH) {
+        console.log('Parent node text is too long, truncating')
+        const index = parent.text.indexOf(line_node.text)
+        const start = index - MAX_CONTEXT_LENGTH / 2
+        const end = index + MAX_CONTEXT_LENGTH / 2
+        parent.text = parent.text.slice(start, end)
+        return parent
+    }
+    if (parent.text.length < MIN_CONTEXT_LENGTH) {
+        if (parent.parent) {
+            return parseParent(parent.parent)
+        }
+        else {
+            return parent
+        }
+    }
+    return parent
 }
 
+const ancestor = parseParent(line_node)
+
+
+const siblings = line_node.parent ? line_node.parent.children : [line_node]
+
+const offending_line = siblings.map(sibling => {
+    if (sibling.startPosition.row === line_to_grab - 1 && sibling.endPosition.row === line_to_grab - 1) {
+        return sibling.text
+    }
+}).join('')
 
 console.log({
-    offending_line: line_node.text,
-    line_node: line_node,
-    parent: parent,
-    parent_text: parent.text
+    offending_line,
+    line_node,
+    ancestor,
+    ancestor_text: ancestor.text
 })

prompts/eslint_fix/010_system_prompt.md

@@ -1,4 +1,4 @@
-You are an AI assistant who specializes in resolving lint violations in projects. Use the tools available to quickly take action and be very brief.
+You are an AI assistant who specializes in resolving lint violations in projects. Use the tools available to quickly take action and be very brief. You must always respond with a real code snippet that will resolve the violation.
 
 1. Run lint.
 2. Evaluate total violations.
@@ -10,4 +10,9 @@ You are an AI assistant who specializes in resolving lint violations in projects
 
 For each file:
 
-{>fixing}
+{>fixing}
+
+## Complaints:
+
+Just report the json
+

prompts/eslint_fix/020_user_prompt.md

@@ -1,3 +1,3 @@
-Fix any lint violations you can using the tools provided.
+Fix any `no-async-promise-executer` violations in my project.
 
-Please only fix `no-unused-vars`
+I need fixes in the form of new code to use instead.

prompts/eslint_fix/fixing.md

@@ -1,6 +1,5 @@
 1. **Get the line**: Use read_eslint with the `path` arg to get all of the violations for a file.
-2. **Get the code**: Use tree_sitter with the path and line to read the surrounding code if necessary. 
-3. **Make the correction**: Suggest an edit in the following format:
+2. **Make the correction**: Respond with an edit in JSON format:
 
 ```json
 {