added support for inline markup, fixes #523, fixes #624 (#655)

* added support for inline markup, fixes #523, fixes #624

.haxerc

@@ -1,4 +1,4 @@
 {
-  "version": "651ecf3",
+  "version": "779b005",
   "resolveLibs": "scoped"
 }

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## dev branch / next version (1.x.x)
 
+## version 1.14.0 (2022-08-27)
+
+- Added support for inline markup, fixes [#523](https://github.com/HaxeCheckstyle/haxe-formatter/issues/523) + [#624](https://github.com/HaxeCheckstyle/haxe-formatter/issues/624) ([#655](https://github.com/HaxeCheckstyle/haxe-formatter/issues/655))
+
 ## version 1.13.1 (2022-04-26)
 
 - Fixed conditional line ends / wrapping ([#654](https://github.com/HaxeCheckstyle/haxe-formatter/issues/654))

haxe_libraries/tokentree.hxml

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

haxelib.json

@@ -8,8 +8,8 @@
 		"style"
 	],
 	"description": "A code formatter for Haxe",
-	"version": "1.13.1",
-	"releasenote": "fixed conditional line ends / wrapping, fixed whitespace after from/to with arrow functions - see CHANGELOG for details.",
+	"version": "1.14.0",
+	"releasenote": "added support for inline markup - see CHANGELOG for details.",
 	"contributors": [
 		"AlexHaxe",
 		"Gama11"

package.json

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

src/formatter/codedata/ParsedCode.hx

@@ -72,6 +72,15 @@ class ParsedCode {
 					skipCount = 1;
 				case Binop(OpGte):
 					skipCount = 1;
+				case Const(CMarkup(_)):
+					var skipIndex = index + 1;
+					while (true) {
+						if (tokens[skipIndex].pos.min >= token.pos.max) {
+							break;
+						}
+						skipCount++;
+						skipIndex++;
+					}
 				case Const(CInt(v)):
 					if (v.startsWith("-")) {
 						skipCount = 1;

src/formatter/import.hx

@@ -1,9 +1,9 @@
 package formatter;
 
 #if (tokentree && !macro)
-import byte.ByteData;
 import haxe.io.Bytes;
 import haxe.macro.Expr;
+import byte.ByteData;
 import haxeparser.Data;
 import tokentree.TokenTree;
 import tokentree.TokenTreeAccessHelper;

test/TestCaseMacro.hx

@@ -1,8 +1,8 @@
-import haxe.macro.Expr;
-import haxe.macro.Context;
 import haxe.io.Path;
-import sys.io.File;
+import haxe.macro.Context;
+import haxe.macro.Expr;
 import sys.FileSystem;
+import sys.io.File;
 
 class TestCaseMacro {
 	#if macro

test/testcases/other/inline_markup.hxtest

@@ -0,0 +1,76 @@
+{}
+
+---
+
+function inline_markup() {
+	<xml a=// </xml>
+
+	static var SRC =
+	<obj class="foo" padding-left={value} color="blue">
+		@exampleText("!")
+		<custom(55) public id="sub" custom-color="#ff0 0.5" active/>
+		<custom(66) if( anotherCustom )/>
+	</obj>;
+
+	super (<xml />);
+	super (<xml><xml /></xml>);
+
+	<xml></xml>;
+	<xml ></xml>;
+	<xml > </xml>;
+
+	<div some="attributes"/>;
+	<foo>$${x < foo ? "a" : "b"}</foo>;
+
+	<xml><xml></xml></xml>;
+	<xml><yml></xml>;
+
+	<xml/>;
+	<xml abc />;
+
+	static var SRC = <syntax-test>
+		for( x in arr )
+			<custom(x)/>
+		for( y in arr ) {
+			<custom(y)/>
+			<custom(y)/>
+		}
+	</syntax-test>
+}
+
+---
+
+function inline_markup() {
+	<xml a=// </xml>
+
+	static var SRC = <obj class="foo" padding-left={value} color="blue">
+		@exampleText("!")
+		<custom(55) public id="sub" custom-color="#ff0 0.5" active/>
+		<custom(66) if( anotherCustom )/>
+	</obj>;
+
+	super(<xml />);
+	super(<xml><xml /></xml>);
+
+	<xml></xml>;
+	<xml ></xml>;
+	<xml > </xml>;
+
+	<div some="attributes"/>;
+	<foo>$${x < foo ? "a" : "b"}</foo>;
+
+	<xml><xml></xml></xml>;
+	<xml><yml></xml>;
+
+	<xml/>;
+	<xml abc />;
+
+	static var SRC = <syntax-test>
+		for( x in arr )
+			<custom(x)/>
+		for( y in arr ) {
+			<custom(y)/>
+			<custom(y)/>
+		}
+	</syntax-test>
+}

test/testcases/other/issue_523_inline_markup.hxtest

@@ -0,0 +1,50 @@
+{
+    "indentation": {
+        "character": "    "
+    },
+    "sameLine": {
+        "ifBody": "keep",
+        "elseIf": "keep",
+        "elseBody": "keep",
+        "forBody": "keep",
+        "whileBody": "keep"
+    }
+}
+
+---
+
+class Test {
+	function main() {
+		final user = "usr";
+
+		XmlTools.toString(
+			<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:foo="https://foo.bar/baz">
+				<soap:Header>
+					<foo:Foo>
+						<foo:User>${user}</foo:User>
+					</foo:Foo>
+				</soap:Header>
+				<soap:Body>
+				</soap:Body>
+			</soap:Envelope>
+		);
+	}
+}
+
+---
+
+class Test {
+    function main() {
+        final user = "usr";
+
+        XmlTools.toString(<soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope" xmlns:foo="https://foo.bar/baz">
+				<soap:Header>
+					<foo:Foo>
+						<foo:User>${user}</foo:User>
+					</foo:Foo>
+				</soap:Header>
+				<soap:Body>
+				</soap:Body>
+			</soap:Envelope>);
+    }
+}

test/testcases/other/issue_624_inline_markup.hxtest

@@ -0,0 +1,33 @@
+{}
+
+---
+
+// https://heaps.io/documentation/domkit.html
+class SampleView extends h2d.Flow implements h2d.domkit.Object {
+
+    static var SRC = 
+        <sample-view layout="vertical"> 
+            Hello World! 
+            <bitmap src={tile} public id="mybmp"/>
+        </sample-view>
+
+    public function new(tile:h2d.Tile,?parent) {
+        super(parent);
+        initComponent();
+    }
+}
+
+---
+
+// https://heaps.io/documentation/domkit.html
+class SampleView extends h2d.Flow implements h2d.domkit.Object {
+	static var SRC = <sample-view layout="vertical"> 
+            Hello World! 
+            <bitmap src={tile} public id="mybmp"/>
+        </sample-view>
+
+	public function new(tile:h2d.Tile, ?parent) {
+		super(parent);
+		initComponent();
+	}
+}