🐛 fix wrong locations for filters syntax with line breaks

vuejs · Dec 1, 2018 · 595b9ae · 595b9ae
1 parent a6135f8
commit 595b9ae
Show file tree

Hide file tree

Showing 8 changed files with 789 additions and 12 deletions.
diff --git a/src/script/index.ts b/src/script/index.ts
@@ -461,16 +461,15 @@ function parseFilter(
                 range: [callee.range[0], callee.range[1] - 2],
                 loc: {
                     start: callee.loc.start,
-                    end: {
-                        line: callee.loc.end.line,
-                        column: callee.loc.end.column - 2,
-                    },
+                    end: locationCalculator.getLocation(
+                        callee.range[1] - callee.range[0] - 1,
+                    ),
                 },
                 name: String(callee.value),
             }
             tokens.push({
                 type: "Identifier",
-                value: calleeCode,
+                value: calleeCode.trim(),
                 range: expression.callee.range,
                 loc: expression.callee.loc,
             })

diff --git a/test/fixtures/ast/filters-2/ast.json b/test/fixtures/ast/filters-2/ast.json
@@ -555,7 +555,7 @@
             },
             {
                 "type": "Identifier",
-                "value": " f1 ",
+                "value": "f1",
                 "range": [
                     31,
                     33
@@ -591,7 +591,7 @@
             },
             {
                 "type": "Identifier",
-                "value": " f2",
+                "value": "f2",
                 "range": [
                     36,
                     38
@@ -667,7 +667,7 @@
             },
             {
                 "type": "Identifier",
-                "value": " f3",
+                "value": "f3",
                 "range": [
                     43,
                     45

diff --git a/test/fixtures/ast/filters-3/ast.json b/test/fixtures/ast/filters-3/ast.json
@@ -617,7 +617,7 @@
             },
             {
                 "type": "Identifier",
-                "value": " f1 ",
+                "value": "f1",
                 "range": [
                     35,
                     37
@@ -653,7 +653,7 @@
             },
             {
                 "type": "Identifier",
-                "value": " f2",
+                "value": "f2",
                 "range": [
                     40,
                     42
@@ -729,7 +729,7 @@
             },
             {
                 "type": "Identifier",
-                "value": " f3",
+                "value": "f3",
                 "range": [
                     47,
                     49