fixed extends handling in interfaces

HaxeCheckstyle · May 21, 2023 · 8860da2 · 8860da2
1 parent 420135c
commit 8860da2
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.2.10 (2023-05-21)
+
+- fixed extends handling in interfaces
+
 ## version 1.2.9 (2023-05-21)
 
 - Fixed unicode in regexp, fixes [#219](https://github.com/HaxeCheckstyle/tokentree/issues/219)

diff --git a/haxe_libraries/json2object.hxml b/haxe_libraries/json2object.hxml
@@ -1,4 +1,4 @@
-# @install: lix --silent download "gh://github.com/elnabo/json2object#64b46769a143207f266010997ea24aa9764505ce" into json2object/3.10.0/github/64b46769a143207f266010997ea24aa9764505ce
+# @install: lix --silent download "haxelib:/json2object#3.11.0" into json2object/3.11.0/haxelib
 -lib hxjsonast
--cp ${HAXE_LIBCACHE}/json2object/3.10.0/github/64b46769a143207f266010997ea24aa9764505ce/src
--D json2object=3.10.0
+-cp ${HAXE_LIBCACHE}/json2object/3.11.0/haxelib/src
+-D json2object=3.11.0
diff --git a/haxe_libraries/test-adapter.hxml b/haxe_libraries/test-adapter.hxml
@@ -1,5 +1,5 @@
-# @install: lix --silent download "haxelib:/test-adapter#2.0.4" into test-adapter/2.0.4/haxelib
+# @install: lix --silent download "haxelib:/test-adapter#2.0.5" into test-adapter/2.0.5/haxelib
 -lib json2object
--cp ${HAXE_LIBCACHE}/test-adapter/2.0.4/haxelib/
--D test-adapter=2.0.4
+-cp ${HAXE_LIBCACHE}/test-adapter/2.0.5/haxelib/
+-D test-adapter=2.0.5
 --macro _testadapter.Macro.init()
diff --git a/haxelib.json b/haxelib.json
@@ -7,8 +7,8 @@
     "contributors": [
         "AlexHaxe"
     ],
-    "releasenote": "fixed unicode in regex - see CHANGELOG for details",
-    "version": "1.2.9",
+    "releasenote": "fixed extends handling in interfaces - see CHANGELOG for details",
+    "version": "1.2.10",
     "url": "https://github.com/HaxeCheckstyle/tokentree",
     "dependencies": {}
 }
diff --git a/makeReleaseZip.sh b/makeReleaseZip.sh
@@ -2,7 +2,7 @@
 
 npm install
 npx lix download
-npx lix use haxe 4.2.5
+npx lix use haxe 4.3.1
 
 haxe test.hxml
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tokentree",
-    "version": "1.2.9",
+    "version": "1.2.10",
     "description": "TokenTree library used by haxe-checkstyle, haxe-formatter and haxe-languageserver",
     "repository": {
         "type": "git",

diff --git a/src/tokentree/walk/WalkExtends.hx b/src/tokentree/walk/WalkExtends.hx
@@ -8,7 +8,7 @@ class WalkExtends {
 		WalkComment.walkComment(stream, parent);
 		WalkTypeNameDef.walkTypeNameDef(stream, parentType);
 		WalkComment.walkComment(stream, parent);
-		WalkExtends.walkExtends(stream, parentType);
+		WalkExtends.walkExtends(stream, parent);
 		WalkComment.walkComment(stream, parent);
 	}
 }