Fix lambda and function parameter not renaming

Author: mug1wara26

server/src/ast.ts

@@ -195,7 +195,7 @@ export class AST {
                 }
                 const param_declaration: ParameterSymbol = {
                   name: name,
-                  scope: lambda.body.loc!,
+                  scope: lambda.loc!,
                   meta: this.context.chapter == Chapter.SOURCE_1 || this.context.chapter === Chapter.SOURCE_2 ? "const" : "let",
                   declarationKind: DeclarationKind.KIND_PARAM,
                   range: sourceLocToRange(param.loc!),
@@ -241,7 +241,8 @@ export class AST {
           }
           const param_declaration: ParameterSymbol = {
             name: name,
-            scope: child.body.loc!,
+            // Set the scope to the function loc so that the parameter can be renamed
+            scope: child.loc!,
             meta: this.context.chapter == Chapter.SOURCE_1 || this.context.chapter === Chapter.SOURCE_2 ? "const" : "let",
             declarationKind: DeclarationKind.KIND_PARAM,
             range: sourceLocToRange(loc),
@@ -351,12 +352,12 @@ export class AST {
         scopeFound = true;
       if (scopeFound && node.type === NODES.IDENTIFIER && node.name === identifier.name)
         ret.push(sourceLocToRange(node.loc!))
-
+      
       getNodeChildren(node, true).forEach(node => {
         if (
           scopeFound
           // We want to ignore scopes where the variable was redeclared
-          // This occurs when there is an inner scope in the scope of our declaration, and the child node belongs in that scope
+          // This occurs when there is a declaration with a scope in the scope of our original declaration, and the child node belongs in that scope
           && !this.declarations.get(identifier.name)?.some(x => !sourceLocEquals(x.scope, declaration.scope) && sourceLocInSourceLoc(x.scope, declaration.scope) && sourceLocInSourceLoc(node.loc!, x.scope))
           || (!scopeFound && node.loc && sourceLocInSourceLoc(declaration.scope, node.loc))
         )
@@ -387,9 +388,11 @@ export class AST {
     // This leads to an error in the client, as there are two changes to the program that have overlapping ranges
     // For now, if the name that the user is trying to rename is an imported name, we don't allow renames
     // I will leave this for a future CP3108 student to fix :)
+
     const identifier = this.findIdentifierNode(vsPosToEsPos(pos));
     if (!identifier) return null;
 
+
     const declaration = this.findDeclarationByName(identifier.name, identifier.loc!);
     if (!declaration || declaration.declarationKind === DeclarationKind.KIND_IMPORT) return null;
 

server/src/test/featuresTest.ts

@@ -96,6 +96,56 @@ suite("Rename", () => {
             }
         });
     });
+
+    test("Rename Function Parameters", () => {
+        const text = "function test(arg1) { return arg1; }";
+        const doc = TextDocument.create("test://test/test.sourcejs", 'sourcejs', 0, text);
+        const ast = new AST(text, context, doc.uri);
+        const edits = ast.renameSymbol(
+            { line: 0, character: 15 },
+            'y'
+        )
+
+        assert.deepStrictEqual(edits, {
+            changes: {
+                [doc.uri]: [
+                    {
+                        "range": { "start": { "line": 0, "character": 14 }, "end": { "line": 0, "character": 18 } },
+                        "newText": "y"
+                    },
+                    {
+                        "range": { "start": { "line": 0, "character": 29 }, "end": { "line": 0, "character": 33 } },
+                        "newText": "y"
+                    }
+                ]
+            }
+        })
+    })
+
+    test("Rename Lambda Parameters", () => {
+        const text = "const test = (arg1) => { return arg1; }";
+        const doc = TextDocument.create("test://test/test.sourcejs", 'sourcejs', 0, text);
+        const ast = new AST(text, context, doc.uri);
+        const edits = ast.renameSymbol(
+            { line: 0, character: 15 },
+            'y'
+        )
+
+        assert.deepStrictEqual(edits, {
+            changes: {
+                [doc.uri]: [
+                    {
+                        "range": { "start": { "line": 0, "character": 14 }, "end": { "line": 0, "character": 18 } },
+                        "newText": "y"
+                    },
+                    {
+                        "range": { "start": { "line": 0, "character": 32 }, "end": { "line": 0, "character": 36 } },
+                        "newText": "y"
+                    }
+                ]
+            }
+        })
+    })
 });
 
 suite("Document Symbols", () => {

server/src/utils.ts

@@ -111,7 +111,7 @@ export function getNodeChildren(node: es.Node, allChildren = false): es.Node[] {
       return node.argument ? [node.argument] : []
     case 'FunctionDeclaration':
       const func_id: es.Node[] = (allChildren && node.id) ? [node.id] : []
-      return func_id.concat([node.body])
+      return func_id.concat(allChildren ? node.params : [], [node.body])
     case 'VariableDeclaration':
       return node.declarations.flatMap(x => getNodeChildren(x, allChildren))
     case 'VariableDeclarator':
@@ -123,7 +123,7 @@ export function getNodeChildren(node: es.Node, allChildren = false): es.Node[] {
     case 'ImportSpecifier':
       return [node.imported, node.local]
     case 'ArrowFunctionExpression':
-      return [node.body]
+      return (allChildren ? (node.params as es.Node[]) : []).concat(node.body)
     case 'FunctionExpression':
       return [node.body]
     case 'UnaryExpression':
@@ -252,7 +252,7 @@ export function esPosInSourceLoc(pos: es.Position, loc: es.SourceLocation) {
 }
 
 export function sourceLocInSourceLoc(inner: es.SourceLocation, outer: es.SourceLocation) {
-  return vsPosInSourceLoc({ line: inner.start.line - 1, character: inner.start.column }, outer) && vsPosInSourceLoc({ line: inner.end.line - 1, character: inner.end.column }, outer);
+  return esPosInSourceLoc(inner.start, outer) && esPosInSourceLoc(inner.end, outer);
 }
 
 export function sourceLocEquals(s1: es.SourceLocation, s2: es.SourceLocation) {

test_files/functions.source

@@ -1,15 +1,4 @@
-// PREPENDED LINES, DO NOT EDIT
-import { black } from "rune";
-const foo = (x, y) => x*y;
-// END OF PREPEND
-function test(arg1, ...args) {
-    
-}
-
-const x = () => return 0
-x();
-
-let y = 1;
-y(); // Runtime error
-
-foo(10, 5);
+const x = 1;
+function test(arg1) {
+    return arg1; 
+}

test_files/lambda.source

@@ -1,5 +1,3 @@
 const test = (x) => {
     return x;
-};
-
-(x) => {};
+};