From 8860da2ee8c8b173538a057ae8e06db8b91c8c46 Mon Sep 17 00:00:00 2001
From: AlexHaxe <Alexander.Blum@gmail.com>
Date: Sun, 21 May 2023 20:28:49 +0200
Subject: [PATCH] fixed extends handling in interfaces

---
 CHANGELOG.md                      | 4 ++++
 haxe_libraries/json2object.hxml   | 6 +++---
 haxe_libraries/test-adapter.hxml  | 6 +++---
 haxelib.json                      | 4 ++--
 makeReleaseZip.sh                 | 2 +-
 package-lock.json                 | 4 ++--
 package.json                      | 2 +-
 src/tokentree/walk/WalkExtends.hx | 2 +-
 8 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a757a9..deab238 100644
--- 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
index a994f9b..897b5a3 100644
--- 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
\ No newline at end of file
+-cp ${HAXE_LIBCACHE}/json2object/3.11.0/haxelib/src
+-D json2object=3.11.0
\ No newline at end of file
diff --git a/haxe_libraries/test-adapter.hxml b/haxe_libraries/test-adapter.hxml
index f041683..2fde4ca 100644
--- 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()
\ No newline at end of file
diff --git a/haxelib.json b/haxelib.json
index a934968..2bb4c77 100644
--- 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": {}
 }
\ No newline at end of file
diff --git a/makeReleaseZip.sh b/makeReleaseZip.sh
index ecf31d5..a4fb51c 100755
--- 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
index 6be5c6b..2984555 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "tokentree",
-    "version": "1.2.9",
+    "version": "1.2.10",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "tokentree",
-            "version": "1.2.9",
+            "version": "1.2.10",
             "license": "MIT",
             "devDependencies": {
                 "lix": "^15.12.0"
diff --git a/package.json b/package.json
index ce98a5b..2e91811 100644
--- 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
index 0403c06..1e5032c 100644
--- 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);
 	}
 }
\ No newline at end of file