Add failing test case

#515

Author: skovhus

server/src/__tests__/analyzer.test.ts

@@ -164,11 +164,11 @@ describe('findDeclarationLocations', () => {
           "range": Object {
             "end": Object {
               "character": 17,
-              "line": 11,
+              "line": 12,
             },
             "start": Object {
               "character": 10,
-              "line": 11,
+              "line": 12,
             },
           },
           "uri": "file://${FIXTURE_FOLDER}scope.sh",
@@ -540,11 +540,11 @@ describe('findDeclarationsMatchingWord', () => {
             "range": Object {
               "end": Object {
                 "character": 17,
-                "line": 11,
+                "line": 12,
               },
               "start": Object {
                 "character": 10,
-                "line": 11,
+                "line": 12,
               },
             },
             "uri": "file://${FIXTURE_FOLDER}scope.sh",
@@ -555,7 +555,7 @@ describe('findDeclarationsMatchingWord', () => {
     `)
 
     // Local function definition
-    expect(findWordFromLine('f', 20)).toMatchInlineSnapshot(`
+    expect(findWordFromLine('f', 23)).toMatchInlineSnapshot(`
       Array [
         Object {
           "containerName": "g",
@@ -564,11 +564,11 @@ describe('findDeclarationsMatchingWord', () => {
             "range": Object {
               "end": Object {
                 "character": 5,
-                "line": 18,
+                "line": 21,
               },
               "start": Object {
                 "character": 4,
-                "line": 15,
+                "line": 18,
               },
             },
             "uri": "file://${FIXTURE_FOLDER}scope.sh",
@@ -609,7 +609,7 @@ describe('findDeclarationsMatchingWord', () => {
             "range": Object {
               "end": Object {
                 "character": 1,
-                "line": 26,
+                "line": 30,
               },
               "start": Object {
                 "character": 0,
@@ -622,6 +622,9 @@ describe('findDeclarationsMatchingWord', () => {
         },
       ]
     `)
+
+    // FIXME: this should return the a reference to the function
+    expect(findWordFromLine('GLOBAL_1', 1000)).toHaveLength(1)
   })
 })
 

server/src/__tests__/server.test.ts

@@ -274,7 +274,7 @@ describe('server', () => {
         },
         position: {
           // X
-          line: 28,
+          line: 32,
           character: 8,
         },
       },
@@ -324,71 +324,71 @@ describe('server', () => {
           "range": Object {
             "end": Object {
               "character": 11,
-              "line": 11,
+              "line": 12,
             },
             "start": Object {
               "character": 10,
-              "line": 11,
+              "line": 12,
             },
           },
         },
         Object {
           "range": Object {
             "end": Object {
               "character": 13,
-              "line": 12,
+              "line": 15,
             },
             "start": Object {
               "character": 12,
-              "line": 12,
+              "line": 15,
             },
           },
         },
         Object {
           "range": Object {
             "end": Object {
               "character": 13,
-              "line": 16,
+              "line": 19,
             },
             "start": Object {
               "character": 12,
-              "line": 16,
+              "line": 19,
             },
           },
         },
         Object {
           "range": Object {
             "end": Object {
               "character": 15,
-              "line": 17,
+              "line": 20,
             },
             "start": Object {
               "character": 14,
-              "line": 17,
+              "line": 20,
             },
           },
         },
         Object {
           "range": Object {
             "end": Object {
               "character": 11,
-              "line": 25,
+              "line": 29,
             },
             "start": Object {
               "character": 10,
-              "line": 25,
+              "line": 29,
             },
           },
         },
         Object {
           "range": Object {
             "end": Object {
               "character": 9,
-              "line": 28,
+              "line": 32,
             },
             "start": Object {
               "character": 8,
-              "line": 28,
+              "line": 32,
             },
           },
         },

server/src/util/declarations.ts

@@ -94,6 +94,9 @@ export function getAllDeclarationsInTree({
  * Done by traversing the tree upwards (which is a simplification for
  * actual bash behaviour but deemed good enough, compared to the complexity of flow tracing).
  * Filters out duplicate definitions. Used when getting declarations for the current scope.
+ *
+ * FIXME: unfortunately this doesn't capture all global variables defined inside functions.
+ * Wondering if getGlobalDeclarations should return this or we should make that a custom feature of this function.
  */
 export function getLocalDeclarations({
   node,

testing/fixtures/scope.sh

@@ -7,9 +7,12 @@ X="Mouse"
 # some function
 f() (
   local X="Dog"
+  GLOBAL_1="Global 1"
 
   g() {
     local X="Cat"
+    GLOBAL_1="Global 1"
+    GLOBAL_2="Global 1"
     echo "${X}"
 
     # another function function
@@ -23,8 +26,11 @@ f() (
 
   g
 
+  echo "${GLOBAL_1}"
   echo "${X}"
 )
 
 echo "${X}"
 f
+
+echo "${GLOBAL_2}"