fixed positions when using inserted tokens in relaxed mode (#145)

* fixed positions when using inserted tokens in relaxed mode * prepare version 1.0.17
HaxeCheckstyle · Mar 6, 2019 · e1d4742 · e1d4742
1 parent 51a30d4
commit e1d4742
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.0.17 (2019-03-06)
+
+- Fixed wrong position of elements preceeding inserted dummy tokens in relax mode [#145](https://github.com/HaxeCheckstyle/tokentree/issues/145)
+
 ## version 1.0.16 (2019-03-04)
 
 - Added `TokenTreeCheckUtils.isMetadata` [#143](https://github.com/HaxeCheckstyle/tokentree/issues/143)

diff --git a/haxelib.json b/haxelib.json
@@ -8,7 +8,7 @@
         "AlexHaxe"
     ],
     "releasenote": "bugfixes - see CHANGELOG for details",
-    "version": "1.0.16",
+    "version": "1.0.17",
     "url": "https://github.com/HaxeCheckstyle/tokentree",
     "dependencies": {}
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tokentree",
-    "version": "1.0.16",
+    "version": "1.0.17",
     "description": "TokenTree library used by haxe-checkstyle, haxe-formatter and haxe-languageserver",
     "repository": {
         "type": "git",

diff --git a/src/tokentree/TokenStream.hx b/src/tokentree/TokenStream.hx
@@ -329,14 +329,22 @@ class TokenStream {
 	}
 
 	function createDummyToken(tokDef:TokenDef):TokenTree {
-		var pos:Null<Position> = null;
+		var pos:Position;
 		if ((current < 0) || (current >= tokens.length)) {
-			pos = tokens[tokens.length - 1].pos;
-			pos.min = pos.max;
+			var prevPos:Position = tokens[tokens.length - 1].pos;
+			pos = {
+				min: prevPos.max,
+				max: prevPos.max,
+				file: prevPos.file
+			}
 		}
 		else {
-			pos = tokens[current].pos;
-			pos.max = pos.min;
+			var prevPos:Position = tokens[current].pos;
+			pos = {
+				min: prevPos.min,
+				max: prevPos.min,
+				file: prevPos.file
+			}
 		}
 		return new TokenTree(tokDef, "", pos, -1, true);
 	}