Update fixtures with additional cases

Author: skovhus

server/src/__tests__/analyzer.test.ts

@@ -485,11 +485,11 @@ describe('findDeclarationsMatchingWord', () => {
           "location": Object {
             "range": Object {
               "end": Object {
-                "character": 19,
+                "character": 25,
                 "line": 6,
               },
               "start": Object {
-                "character": 0,
+                "character": 6,
                 "line": 6,
               },
             },
@@ -514,11 +514,11 @@ describe('findDeclarationsMatchingWord', () => {
           "location": Object {
             "range": Object {
               "end": Object {
-                "character": 19,
+                "character": 25,
                 "line": 6,
               },
               "start": Object {
-                "character": 0,
+                "character": 6,
                 "line": 6,
               },
             },
@@ -566,11 +566,11 @@ describe('findDeclarationsMatchingWord', () => {
           "location": Object {
             "range": Object {
               "end": Object {
-                "character": 19,
+                "character": 25,
                 "line": 6,
               },
               "start": Object {
-                "character": 0,
+                "character": 6,
                 "line": 6,
               },
             },
@@ -927,11 +927,11 @@ describe('getAllVariables', () => {
           "location": Object {
             "range": Object {
               "end": Object {
-                "character": 19,
+                "character": 25,
                 "line": 6,
               },
               "start": Object {
-                "character": 0,
+                "character": 6,
                 "line": 6,
               },
             },
@@ -944,11 +944,11 @@ describe('getAllVariables', () => {
           "location": Object {
             "range": Object {
               "end": Object {
-                "character": 16,
+                "character": 23,
                 "line": 7,
               },
               "start": Object {
-                "character": 0,
+                "character": 7,
                 "line": 7,
               },
             },
@@ -961,12 +961,12 @@ describe('getAllVariables', () => {
           "location": Object {
             "range": Object {
               "end": Object {
-                "character": 17,
-                "line": 8,
+                "character": 19,
+                "line": 10,
               },
               "start": Object {
-                "character": 0,
-                "line": 8,
+                "character": 2,
+                "line": 10,
               },
             },
             "uri": "file://${FIXTURE_FOLDER}extension.inc",

testing/fixtures.ts

@@ -21,6 +21,7 @@ export const FIXTURE_URI = {
   ISSUE101: `file://${path.join(FIXTURE_FOLDER, 'issue101.sh')}`,
   ISSUE206: `file://${path.join(FIXTURE_FOLDER, 'issue206.sh')}`,
   MISSING_EXTENSION: `file://${path.join(FIXTURE_FOLDER, 'extension')}`,
+  EXTENSION_INC: `file://${path.join(FIXTURE_FOLDER, 'extension.inc')}`,
   MISSING_NODE: `file://${path.join(FIXTURE_FOLDER, 'missing-node.sh')}`,
   OPTIONS: `file://${path.join(FIXTURE_FOLDER, 'options.sh')}`,
   OVERRIDE_SYMBOL: `file://${path.join(FIXTURE_FOLDER, 'override-executable-symbol.sh')}`,

testing/fixtures/extension.inc

@@ -4,14 +4,21 @@ source ./issue101.sh
 
 RED=`tput setaf 1`
 GREEN=`tput setaf 2`
-BLUE=`tput setaf 4`
-BOLD=`tput bold`
-RESET=`tput sgr0`
+local BLUE=`tput setaf 4` # local at the root is still exposed to the global scope
+export BOLD=`tput bold`
+
+{ # non colors in a group
+  RESET=`tput sgr0`
+}
 
 extensionFunc() {
   LOCAL_VARIABLE='local'
 
   innerExtensionFunc() {
     echo $LOCAL_VARIABLE
   }
-}
+}
+
+if [ "${ENV}" = "prod" ]; then
+  RED="" # Ignored as we do not flowtrace.
+fi