Fixed wrong end location of Program node. (#16)

Author: ota-meshi

lib/parser/json-eslint-parser.ts

@@ -58,6 +58,9 @@ export function parseForESLint(
             return throwUnexpectedTokenError(",", last)
         }
 
+        ast.range[1] = statement.range![1] = last.range[1]
+        ast.loc.end.line = statement.loc!.end.line = last.loc.end.line
+        ast.loc.end.column = statement.loc!.end.column = last.loc.end.column
         ast.body = [statement]
         statement.expression = expression
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jsonc",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "ESLint plugin for JSON, JSONC and JSON5 files.",
   "main": "dist/index.js",
   "typescript": {
@@ -58,7 +58,7 @@
   },
   "homepage": "https://ota-meshi.github.io/eslint-plugin-jsonc/",
   "peerDependencies": {
-    "eslint": ">=6.0.0"
+    "eslint": "^5.0.0 || >=6.0.0"
   },
   "devDependencies": {
     "@mysticatea/eslint-plugin": "^13.0.0",

tests/fixtures/parser/ast/array-01-output.json

@@ -138,16 +138,16 @@
       },
       "range": [
         0,
-        15
+        13
       ],
       "loc": {
         "start": {
           "line": 1,
           "column": 0
         },
         "end": {
-          "line": 2,
-          "column": 1
+          "line": 1,
+          "column": 13
         }
       }
     }
@@ -391,16 +391,16 @@
   ],
   "range": [
     0,
-    15
+    13
   ],
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 2,
-      "column": 1
+      "line": 1,
+      "column": 13
     }
   }
 }

tests/fixtures/parser/ast/array-02-output.json

@@ -138,16 +138,16 @@
       },
       "range": [
         0,
-        17
+        15
       ],
       "loc": {
         "start": {
           "line": 1,
           "column": 0
         },
         "end": {
-          "line": 2,
-          "column": 1
+          "line": 1,
+          "column": 15
         }
       }
     }
@@ -427,16 +427,16 @@
   ],
   "range": [
     0,
-    17
+    15
   ],
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 2,
-      "column": 1
+      "line": 1,
+      "column": 15
     }
   }
 }

tests/fixtures/parser/ast/array-empty-slots-01-output.json

@@ -44,16 +44,16 @@
       },
       "range": [
         0,
-        8
+        6
       ],
       "loc": {
         "start": {
           "line": 1,
           "column": 0
         },
         "end": {
-          "line": 2,
-          "column": 1
+          "line": 1,
+          "column": 6
         }
       }
     }
@@ -135,16 +135,16 @@
   ],
   "range": [
     0,
-    8
+    6
   ],
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 2,
-      "column": 1
+      "line": 1,
+      "column": 6
     }
   }
 }

tests/fixtures/parser/ast/array-empty-slots-02-output.json

@@ -63,16 +63,16 @@
       },
       "range": [
         0,
-        12
+        10
       ],
       "loc": {
         "start": {
           "line": 1,
           "column": 0
         },
         "end": {
-          "line": 2,
-          "column": 1
+          "line": 1,
+          "column": 10
         }
       }
     }
@@ -190,16 +190,16 @@
   ],
   "range": [
     0,
-    12
+    10
   ],
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 2,
-      "column": 1
+      "line": 1,
+      "column": 10
     }
   }
 }

tests/fixtures/parser/ast/bingint-01-output.json

@@ -84,16 +84,16 @@
       },
       "range": [
         0,
-        12
+        10
       ],
       "loc": {
         "start": {
           "line": 1,
           "column": 0
         },
         "end": {
-          "line": 2,
-          "column": 1
+          "line": 1,
+          "column": 10
         }
       }
     }
@@ -193,16 +193,16 @@
   ],
   "range": [
     0,
-    12
+    10
   ],
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 2,
-      "column": 1
+      "line": 1,
+      "column": 10
     }
   }
 }

tests/fixtures/parser/ast/infinity-01-output.json

@@ -116,16 +116,16 @@
       },
       "range": [
         0,
-        34
+        32
       ],
       "loc": {
         "start": {
           "line": 1,
           "column": 0
         },
         "end": {
-          "line": 2,
-          "column": 1
+          "line": 1,
+          "column": 32
         }
       }
     }
@@ -297,16 +297,16 @@
   ],
   "range": [
     0,
-    34
+    32
   ],
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 2,
-      "column": 1
+      "line": 1,
+      "column": 32
     }
   }
 }

tests/fixtures/parser/ast/infinity-02-output.json

@@ -233,15 +233,15 @@
       },
       "range": [
         0,
-        56
+        54
       ],
       "loc": {
         "start": {
           "line": 1,
           "column": 0
         },
         "end": {
-          "line": 6,
+          "line": 5,
           "column": 1
         }
       }
@@ -522,15 +522,15 @@
   ],
   "range": [
     0,
-    56
+    54
   ],
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 6,
+      "line": 5,
       "column": 1
     }
   }

tests/fixtures/parser/ast/infinity-03-output.json

@@ -23,16 +23,16 @@
       },
       "range": [
         0,
-        10
+        8
       ],
       "loc": {
         "start": {
           "line": 1,
           "column": 0
         },
         "end": {
-          "line": 2,
-          "column": 1
+          "line": 1,
+          "column": 8
         }
       }
     }
@@ -60,16 +60,16 @@
   ],
   "range": [
     0,
-    10
+    8
   ],
   "loc": {
     "start": {
       "line": 1,
       "column": 0
     },
     "end": {
-      "line": 2,
-      "column": 1
+      "line": 1,
+      "column": 8
     }
   }
 }