fixed null pointer issues (#666)

* fixed null pointer issues

.haxerc

@@ -1,4 +1,4 @@
 {
-  "version": "5645ecc",
+  "version": "a985681",
   "resolveLibs": "scoped"
 }

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.14.5 (2023-02-15)
+
+- Fixed null pointer issues ([#666](https://github.com/HaxeCheckstyle/haxe-formatter/issues/666))
+
 ## version 1.14.4 (2022-12-14)
 
 - Refactored PosInfosMacro to limit number of invocations of inner loop

haxe_libraries/tokentree.hxml

@@ -1,3 +1,3 @@
-# @install: lix --silent download "haxelib:/tokentree#1.2.5" into tokentree/1.2.5/haxelib
--cp ${HAXE_LIBCACHE}/tokentree/1.2.5/haxelib/src
--D tokentree=1.2.5
+# @install: lix --silent download "haxelib:/tokentree#1.2.7" into tokentree/1.2.7/haxelib
+-cp ${HAXE_LIBCACHE}/tokentree/1.2.7/haxelib/src
+-D tokentree=1.2.7

haxelib.json

@@ -8,8 +8,8 @@
 		"style"
 	],
 	"description": "A code formatter for Haxe",
-	"version": "1.14.4",
-	"releasenote": "fixed some whitespace formatting issues - see CHANGELOG for details.",
+	"version": "1.14.5",
+	"releasenote": "fixed null pointer issue - see CHANGELOG for details.",
 	"contributors": [
 		"AlexHaxe",
 		"Gama11"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@haxecheckstyle/haxe-formatter",
-	"version": "1.14.4",
+	"version": "1.14.5",
 	"description": "A code formatter for Haxe",
 	"repository": {
 		"type": "git",

resources/hxformat-schema.json

@@ -576,11 +576,11 @@
 		"formatter.config.WrapConditionType": {
 			"anyOf": [
 				{
-					"description": "condition matches if item count is larger than or equal n characters",
+					"description": "condition matches if item count is larger than or equal n items",
 					"const": "itemCount >= n"
 				},
 				{
-					"description": "condition matches if item count is less than or equal n characters",
+					"description": "condition matches if item count is less than or equal n items",
 					"const": "itemCount <= n"
 				},
 				{

src/formatter/config/WrapConfig.hx

@@ -516,12 +516,12 @@ typedef WrapCondition = {
 
 enum abstract WrapConditionType(String) {
 	/**
-		condition matches if item count is larger than or equal n characters
+		condition matches if item count is larger than or equal n items
 	**/
 	var ItemCountLargerThan = "itemCount >= n";
 
 	/**
-		condition matches if item count is less than or equal n characters
+		condition matches if item count is less than or equal n items
 	**/
 	var ItemCountLessThan = "itemCount <= n";
 

src/formatter/marker/MarkEmptyLines.hx

@@ -1063,7 +1063,9 @@ class MarkEmptyLines extends MarkerBase {
 		parsedCode.root.filterCallback(function(token:TokenTree, index:Int):FilterResult {
 			switch (token.tok) {
 				case Kwd(KwdIf):
-					removeEmptyLinesAroundBlock(token.children[1], config.emptyLines.beforeBlocks, Keep);
+					if ((token.children != null) && (token.children.length > 0)) {
+						removeEmptyLinesAroundBlock(token.children[1], config.emptyLines.beforeBlocks, Keep);
+					}
 					var block:Null<TokenTree> = token.access().firstOf(Kwd(KwdElse)).previousSibling().token;
 					if (block != null) {
 						removeEmptyLinesAroundBlock(block, Keep, config.emptyLines.afterBlocks);
@@ -1075,21 +1077,27 @@ class MarkEmptyLines extends MarkerBase {
 					removeEmptyLinesAroundBlock(block, config.emptyLines.beforeBlocks, Keep);
 				case Kwd(KwdFunction):
 				case Kwd(KwdFor):
-					removeEmptyLinesAroundBlock(token.children[1], config.emptyLines.beforeBlocks, Keep);
+					if ((token.children != null) && (token.children.length > 0)) {
+						removeEmptyLinesAroundBlock(token.children[1], config.emptyLines.beforeBlocks, Keep);
+					}
 				case Kwd(KwdDo):
 					removeEmptyLinesAroundBlock(token.getFirstChild(), config.emptyLines.beforeBlocks, Keep);
 					var block:Null<TokenTree> = token.access().lastChild().previousSibling().token;
 					removeEmptyLinesAroundBlock(block, Keep, config.emptyLines.afterBlocks);
 				case Kwd(KwdWhile):
-					if ((token.parent == null) || (!token.parent.tok.match(Kwd(KwdDo)))) {
+					if ((token.children != null)
+						&& (token.children.length > 0)
+						&& (token.parent == null || !token.parent.tok.match(Kwd(KwdDo)))) {
 						removeEmptyLinesAroundBlock(token.children[1], config.emptyLines.beforeBlocks, Keep);
 					}
 				case Kwd(KwdTry):
 					removeEmptyLinesAroundBlock(token.getFirstChild(), config.emptyLines.beforeBlocks, Keep);
 					var block:Null<TokenTree> = token.access().lastChild().previousSibling().token;
 					removeEmptyLinesAroundBlock(block, Keep, config.emptyLines.afterBlocks);
 				case Kwd(KwdCatch):
-					removeEmptyLinesAroundBlock(token.children[1], config.emptyLines.beforeBlocks, Keep);
+					if ((token.children != null) && (token.children.length > 0)) {
+						removeEmptyLinesAroundBlock(token.children[1], config.emptyLines.beforeBlocks, Keep);
+					}
 				default:
 			}
 			return GoDeeper;

src/formatter/marker/wrapping/MarkWrapping.hx

@@ -577,21 +577,23 @@ class MarkWrapping extends MarkWrappingBase {
 			}
 		}
 		var first:Bool = true;
-		for (child in itemStart.children) {
-			switch (child.tok) {
-				case Binop(OpBoolAnd), Binop(OpBoolOr):
-					if (first) {
-						itemStart = firstItemStart;
-						first = false;
-					}
-					items.push(makeWrappableItem(itemStart, child));
-					var next:Null<TokenInfo> = getNextToken(child);
-					if (next == null) {
-						return;
-					}
-					itemStart = next.token;
-				default:
-					continue;
+		if (itemStart.children != null) {
+			for (child in itemStart.children) {
+				switch (child.tok) {
+					case Binop(OpBoolAnd), Binop(OpBoolOr):
+						if (first) {
+							itemStart = firstItemStart;
+							first = false;
+						}
+						items.push(makeWrappableItem(itemStart, child));
+						var next:Null<TokenInfo> = getNextToken(child);
+						if (next == null) {
+							return;
+						}
+						itemStart = next.token;
+					default:
+						continue;
+				}
 			}
 		}
 		items.push(makeWrappableItem(itemStart, TokenTreeCheckUtils.getLastToken(itemStart)));
@@ -630,13 +632,15 @@ class MarkWrapping extends MarkWrappingBase {
 			return;
 		}
 		var itemStart:TokenTree = next.token;
-		for (child in itemContainer.children) {
-			switch (child.tok) {
-				case DblDot:
-					break;
-				default:
-					var lastToken:TokenTree = TokenTreeCheckUtils.getLastToken(child);
-					items.push(makeWrappableItem(child, lastToken));
+		if (itemContainer.children != null) {
+			for (child in itemContainer.children) {
+				switch (child.tok) {
+					case DblDot:
+						break;
+					default:
+						var lastToken:TokenTree = TokenTreeCheckUtils.getLastToken(child);
+						items.push(makeWrappableItem(child, lastToken));
+				}
 			}
 		}
 		queueWrapping({
@@ -709,17 +713,19 @@ class MarkWrapping extends MarkWrappingBase {
 			return;
 		}
 		var itemStart:TokenTree = next.token;
-		for (child in itemContainer.children) {
-			switch (child.tok) {
-				case Binop(OpAdd), Binop(OpSub):
-					items.push(makeWrappableItem(itemStart, child));
-					var next:Null<TokenInfo> = getNextToken(child);
-					if (next == null) {
+		if (itemContainer.children != null) {
+			for (child in itemContainer.children) {
+				switch (child.tok) {
+					case Binop(OpAdd), Binop(OpSub):
+						items.push(makeWrappableItem(itemStart, child));
+						var next:Null<TokenInfo> = getNextToken(child);
+						if (next == null) {
+							continue;
+						}
+						itemStart = next.token;
+					default:
 						continue;
-					}
-					itemStart = next.token;
-				default:
-					continue;
+				}
 			}
 		}
 		items.push(makeWrappableItem(itemStart, TokenTreeCheckUtils.getLastToken(itemStart)));
@@ -850,6 +856,9 @@ class MarkWrapping extends MarkWrappingBase {
 		});
 		for (v in allVars) {
 			var items:Array<WrappableItem> = [];
+			if (v.children == null) {
+				continue;
+			}
 			for (child in v.children) {
 				var endToken:TokenTree = TokenTreeCheckUtils.getLastToken(child);
 				items.push(makeWrappableItem(child, endToken));

src/formatter/marker/wrapping/MarkWrappingBase.hx

@@ -36,25 +36,27 @@ class MarkWrappingBase extends MarkerBase {
 			}
 		}
 		noWrappingBetween(open, close);
-		for (child in open.children) {
-			switch (child.tok) {
-				case PClose, BrClose, BkClose:
-					break;
-				case Binop(OpGt):
-					continue;
-				case Semicolon, Comma:
-					continue;
-				default:
-			}
-			var lastChild:Null<TokenTree> = TokenTreeCheckUtils.getLastToken(child);
-			if (lastChild == null) {
-				continue;
-			} else {
-				switch (lastChild.tok) {
-					case Comma, Semicolon:
-						noLineEndAfter(lastChild);
+		if (open.children != null) {
+			for (child in open.children) {
+				switch (child.tok) {
+					case PClose, BrClose, BkClose:
+						break;
+					case Binop(OpGt):
+						continue;
+					case Semicolon, Comma:
+						continue;
 					default:
 				}
+				var lastChild:Null<TokenTree> = TokenTreeCheckUtils.getLastToken(child);
+				if (lastChild == null) {
+					continue;
+				} else {
+					switch (lastChild.tok) {
+						case Comma, Semicolon:
+							noLineEndAfter(lastChild);
+						default:
+					}
+				}
 			}
 		}
 		noLineEndBefore(close);
@@ -87,26 +89,29 @@ class MarkWrappingBase extends MarkerBase {
 
 	public function keep(open:TokenTree, close:TokenTree, addIndent:Int) {
 		noWrappingBetween(open, close);
-		for (child in open.children) {
-			var last:Bool = false;
-			switch (child.tok) {
-				case PClose, BrClose, BkClose:
-					last = true;
-				case Binop(OpGt):
-					continue;
-				case Semicolon, Comma:
-					continue;
-				default:
-			}
-			if (parsedCode.isOriginalNewlineBefore(child)) {
-				lineEndBefore(child);
-				additionalIndent(child, addIndent);
-			} else {
-				noLineEndBefore(child);
-				wrapBefore(child, false);
-			}
-			if (last) {
-				break;
+
+		if (open.children != null) {
+			for (child in open.children) {
+				var last:Bool = false;
+				switch (child.tok) {
+					case PClose, BrClose, BkClose:
+						last = true;
+					case Binop(OpGt):
+						continue;
+					case Semicolon, Comma:
+						continue;
+					default:
+				}
+				if (parsedCode.isOriginalNewlineBefore(child)) {
+					lineEndBefore(child);
+					additionalIndent(child, addIndent);
+				} else {
+					noLineEndBefore(child);
+					wrapBefore(child, false);
+				}
+				if (last) {
+					break;
+				}
 			}
 		}
 		if (!parsedCode.isOriginalNewlineBefore(open)) {
@@ -182,6 +187,9 @@ class MarkWrappingBase extends MarkerBase {
 		if (!keepFirst) {
 			lineEndAfter(open);
 		}
+		if (open.children == null) {
+			return;
+		}
 		for (child in open.children) {
 			switch (child.tok) {
 				case PClose, BrClose, BkClose:
@@ -452,6 +460,9 @@ class MarkWrappingBase extends MarkerBase {
 		var indent:Int = indenter.calcIndent(lineStart);
 		var lineLength:Int = calcLineLengthBefore(open) + indenter.calcAbsoluteIndent(indent + addIndent);
 		var first:Bool = true;
+		if (open.children == null) {
+			return;
+		}
 		for (child in open.children) {
 			switch (child.tok) {
 				case PClose, BrClose, BkClose:
@@ -552,6 +563,9 @@ class MarkWrappingBase extends MarkerBase {
 	function makeWrappableItems(token:TokenTree):Array<WrappableItem> {
 		var items:Array<WrappableItem> = [];
 		var lastIndex:Int = -1;
+		if (token.children == null) {
+			return items;
+		}
 		for (child in token.children) {
 			switch (child.tok) {
 				case PClose, BkClose, BrClose: