fixed discovery of typed parameters

fixed discovery of type checks
HaxeCheckstyle · Dec 9, 2024 · 8de3607 · 8de3607
1 parent 2c0e1c2
commit 8de3607
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/src/refactor/discover/UsageCollector.hx b/src/refactor/discover/UsageCollector.hx
@@ -974,6 +974,8 @@ class UsageCollector {
 			return null;
 		}
 		switch (nameToken.tok) {
+			case Const(CIdent("is")):
+				return null;
 			case Kwd(KwdNew) | Kwd(KwdThis) | Kwd(KwdNull) | Const(CIdent(_)):
 			default:
 				return null;
@@ -994,6 +996,8 @@ class UsageCollector {
 			}
 			for (child in parentPart.children) {
 				switch (child.tok) {
+					case Const(CIdent("is")):
+						return;
 					case Kwd(KwdNew) | Kwd(KwdThis) | Kwd(KwdNull) | Const(_):
 						pack.push(child.toString());
 					case Dot:
@@ -1108,8 +1112,12 @@ class UsageCollector {
 					makeIdentifier(context, child, TypedParameter, identifier);
 				case POpen:
 					readParameter(context, identifier, child, token.getPos().max);
+				case BrOpen:
+					readBlock(context, identifier, child);
 				case Binop(OpGt):
 					break;
+				case DblDot:
+					readTypeHint(context, identifier, child, TypeHint);
 				default:
 			}
 		}

diff --git a/test/refactor/rename/RenameClassTest.hx b/test/refactor/rename/RenameClassTest.hx
@@ -78,6 +78,9 @@ class RenameClassTest extends RenameTestBase {
 			makeReplaceTestEdit("testcases/classes/pack/UseChild.hx", "ItemClass", 412, 422),
 			makeReplaceTestEdit("testcases/classes/pack/UseChild.hx", "ItemClass", 499, 509),
 			makeReplaceTestEdit("testcases/classes/pack/UseChild.hx", "ItemClass", 612, 622),
+			makeReplaceTestEdit("testcases/classes/pack/UseChild.hx", "ItemClass", 978, 988),
+			makeReplaceTestEdit("testcases/classes/pack/UseChild.hx", "ItemClass", 1039, 1049),
+			makeReplaceTestEdit("testcases/classes/pack/UseChild.hx", "ItemClass", 1081, 1091),
 		];
 		checkRename({fileName: "testcases/classes/ChildClass.hx", toName: "ItemClass", pos: 28}, edits, async);
 	}

diff --git a/testcases/classes/pack/UseChild.hx b/testcases/classes/pack/UseChild.hx
@@ -53,4 +53,14 @@ class UseChild {
 				null;
 		}
 	}
+
+	function typeCheckChildClass(child:Any) {
+		if ((child is ChildClass)) {
+			trace("yes");
+		}
+	}
+}
+
+class TypedChild<T:ChildClass> {
+	var memebers:Array<{sprite:ChildClass, originalX:Float, originalY:Float}> = null;
 }