fixed NPE with module level fields on static targets

added -v / --verbose command line switch
HaxeCheckstyle · Oct 28, 2024 · 684f962 · 684f962
1 parent 798699d
commit 684f962
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## dev branch / next version (2.x.x)
 
+- Added -v / --verbose command line switch
+- Fixed null pointer exception with module level fields on static targets
+
 ## version 2.9.0 (2024-06-10)
 
 - New check `FileNameCase` to check file names match module names ([#527](https://github.com/HaxeCheckstyle/haxe-checkstyle/issues/527))

diff --git a/haxe_libraries/tokentree.hxml b/haxe_libraries/tokentree.hxml
@@ -1,3 +1,3 @@
-# @install: lix --silent download "haxelib:/tokentree#1.2.15" into tokentree/1.2.15/haxelib
--cp ${HAXE_LIBCACHE}/tokentree/1.2.15/haxelib/src
--D tokentree=1.2.15
+# @install: lix --silent download "haxelib:/tokentree#1.2.17" into tokentree/1.2.17/haxelib
+-cp ${HAXE_LIBCACHE}/tokentree/1.2.17/haxelib/src
+-D tokentree=1.2.17
diff --git a/src/checkstyle/Checker.hx b/src/checkstyle/Checker.hx
@@ -22,6 +22,7 @@ class Checker {
 	public var defineCombinations:Array<Array<String>>;
 	public var linesIdx:Array<LineIds>;
 	public var lineSeparator:String;
+	public var verbose:Bool;
 
 	var tokenTree:TokenTree;
 	var allowFailingAST:Bool;
@@ -34,6 +35,7 @@ class Checker {
 		baseDefines = [];
 		defineCombinations = [];
 		linesIdx = [];
+		verbose = false;
 		this.allowFailingAST = allowFailingAST;
 	}
 

diff --git a/src/checkstyle/Main.hx b/src/checkstyle/Main.hx
@@ -70,7 +70,9 @@ class Main {
 				TEXT_PATH = path;
 			},
 			@doc("Set reporter style (XSLT)")
-			["-x", "--xslt"] => function(style:String) STYLE = style,
+			["-x", "--xslt"] => function(style:String) STYLE = style, 
+			@doc("verbose logging")
+			["-v", "--verbose"] => function() checker.verbose = true,
 			@doc("Sets the number of checker threads")
 			["--checkerthreads"] => function(num:Int) configParser.overrideCheckerThreads = num,
 			@doc("Generate a default config and exit")

diff --git a/src/checkstyle/ParserQueue.hx b/src/checkstyle/ParserQueue.hx
@@ -37,6 +37,7 @@ class ParserQueue {
 			var checker:Checker = new Checker();
 			checker.baseDefines = templateChecker.baseDefines;
 			checker.defineCombinations = templateChecker.defineCombinations;
+			checker.verbose = templateChecker.verbose;
 			checker.loadFileContent(file);
 			if (!checker.createContext(file)) {
 				checker.unloadFileContent(file);

diff --git a/src/checkstyle/checks/Check.hx b/src/checkstyle/checks/Check.hx
@@ -1,6 +1,7 @@
 package checkstyle.checks;
 
 import checkstyle.config.ExcludeRange;
+import haxe.Timer;
 
 class Check {
 	public var severity:SeverityLevel;
@@ -31,6 +32,10 @@ class Check {
 	}
 
 	public function run(checker:Checker):Array<Message> {
+		var startTime = Timer.stamp();
+		if (checker.verbose) {
+			Sys.println('${checker.file.name} - [${getModuleName()}] start');
+		}
 		reset();
 		this.checker = checker;
 		if (severity != SeverityLevel.IGNORE) {
@@ -41,6 +46,10 @@ class Check {
 				ErrorUtils.handleException(e, checker.file, getModuleName());
 			}
 		}
+		var endTime = Timer.stamp();
+		if (checker.verbose) {
+			Sys.println('${checker.file.name} - [${getModuleName()}] done. (${(endTime - startTime) * 1000}ms)');
+		}
 		return messages;
 	}
 

diff --git a/src/checkstyle/utils/ComplexTypeUtils.hx b/src/checkstyle/utils/ComplexTypeUtils.hx
@@ -88,7 +88,9 @@ class ComplexTypeUtils {
 	}
 
 	public static function walkStatic(s:Definition<StaticFlag, FieldType>, pos:Position, cb:ComplexTypeCallback) {
-		walkField(cast s, cb);
+		var field:Field = cast s;
+		field.kind = s.data;
+		walkField(field, cb);
 	}
 
 	public static function walkVar(v:Var, pos:Position, cb:ComplexTypeCallback) {

diff --git a/src/checkstyle/utils/ExprUtils.hx b/src/checkstyle/utils/ExprUtils.hx
@@ -88,7 +88,9 @@ class ExprUtils {
 	}
 
 	public static function walkStatic(s:Definition<StaticFlag, FieldType>, pos:Position, cb:Expr -> Void) {
-		walkField(cast s, cb);
+		var field:Field = cast s;
+		field.kind = s.data;
+		walkField(field, cb);
 	}
 
 	public static function walkVar(v:Var, cb:Expr -> Void) {