Various position fixes, and additional test cases

jeremyfa · jeremyfa · commit b931814cc3bb · 2025-04-05T11:19:11.000+02:00
diff --git a/run.n b/run.n
diff --git a/src/loreline/Interpreter.hx b/src/loreline/Interpreter.hx
@@ -1735,13 +1735,6 @@ typedef InterpreterOptions = {
 
     function initializeTopLevelFunction(func:NFunctionDecl) {
 
-        var list:Array<Dynamic> = [
-          "carrot",
-          1234,
-          null,
-          "potato",
-        ];
-
         #if hscript
         if (func.name != null) {
             final codeToHscript = new CodeToHscript();
@@ -2703,18 +2696,41 @@ typedef InterpreterOptions = {
         final tags:Array<TextTag> = [];
         var offset = 0;
 
+        final numParts = str.parts.length;
+
         var keepWhitespace = (str.quotes != Unquoted);
         var keepIndents = (str.quotes != Unquoted);
         var keepComments = (str.quotes != Unquoted);
 
-        for (i in 0...str.parts.length) {
+        var trailingTextPartIndex = -1;
+        if (!keepWhitespace) {
+            var n = numParts - 1;
+            while (n >= 0) {
+                final part = str.parts[n];
+                switch part.partType {
+                    case Raw(_):
+                        // This is the trailing text part
+                        trailingTextPartIndex = n;
+                        break;
+                    case Expr(_):
+                        break; // No trailing text part
+                    case Tag(_, _):
+                        n--;
+                }
+            }
+        }
+
+        for (i in 0...numParts) {
             final part = str.parts[i];
 
             switch (part.partType) {
                 case Raw(text):
                     if (!keepWhitespace) {
                         text = text.ltrim();
                     }
+                    if (i == trailingTextPartIndex) {
+                        text = text.rtrim();
+                    }
                     if (!keepComments) {
                         text = stripStringComments(text);
                     }
diff --git a/src/loreline/Parser.hx b/src/loreline/Parser.hx
@@ -1621,12 +1621,12 @@ class ParserContext {
      * @return StringPart representing the tag
      */
     function parseStringTag(closing:Bool, start:Int, length:Int, content:String, quotes:Quotes, attachments:Array<LStringAttachment>):NStringPart {
-        var pos = makeStringPartPosition(currentPos(), content, start);
-        pos.length = length;
-
+        var strPos = currentPos();
         if (quotes != Unquoted) {
-            pos = pos.withOffset(content, 1, pos.length);
+            strPos = strPos.withOffset(content, 1, strPos.length - 2);
         }
+        var pos = makeStringPartPosition(strPos, content, start);
+        pos.length = length;
 
         // Calculate tag content boundaries
         final offsetStart = (closing ? 2 : 1);
@@ -1654,7 +1654,7 @@ class ParserContext {
 
         // Return simple tag if no interpolations
         if (!hasAttachmentsInRange) {
-            final partPos = makeStringPartPosition(pos, content, innerStart);
+            final partPos = makeStringPartPosition(strPos, content, innerStart);
             partPos.length = innerLength;
             final literalId = nextNodeId(NODE);
             final partId = nextNodeId(NODE);
@@ -1683,22 +1683,25 @@ class ParserContext {
                         if (aStart >= innerStart && aEnd <= innerEnd) {
                             // Add raw text before interpolation
                             if (aStart > currentPos) {
-                                final partPos = makeStringPartPosition(pos, content.uSubstr(start), currentPos - start + offsetStart);
-                                partPos.length = aStart - currentPos;
+                                final partPos = makeStringPartPosition(strPos, content, innerStart);
+                                partPos.length = aStart - innerStart;
                                 parts.push(new NStringPart(nextNodeId(NODE), partPos, Raw(
                                     content.uSubstr(currentPos, aStart - currentPos)
                                 )));
                             }
 
                             // Process interpolation
-                            parts.push(parseStringInterpolation(
+                            final interpPart = parseStringInterpolation(
                                 braces,
                                 true,
                                 tokens,
                                 aStart,
                                 aLength,
                                 content
-                            ));
+                            );
+                            interpPart.pos = makeStringPartPosition(strPos, content, aStart);
+                            interpPart.pos.length = aLength;
+                            parts.push(interpPart);
 
                             currentPos = aEnd;
                         }
diff --git a/src/loreline/lsp/Server.hx b/src/loreline/lsp/Server.hx
@@ -1488,7 +1488,7 @@ class Server {
                     case Expr(expr):
                         return makeNodeHover(lorelinePos, lens, uri, content, expr);
                     case Tag(closing, expr):
-                        return makeHover(hoverTitle('Tag', "&lt;" + printLoreline(expr) + "&gt;"), hoverDescriptionForNode(expr), content, stringPart);
+                        return makeHover(hoverTitle('Tag', "&lt;" + (closing ? "/" : "") + printLoreline(expr) + "&gt;"), hoverDescriptionForNode(expr), content, stringPart);
                 }
 
                 final literal = lens.getFirstParentOfType(node, NStringLiteral);
@@ -1502,7 +1502,7 @@ class Server {
                             case Expr(expr):
                                 return makeNodeHover(lorelinePos, lens, uri, content, expr);
                             case Tag(closing, expr):
-                                return makeHover(hoverTitle('Tag', "&lt;" + printLoreline(expr) + "&gt;"), hoverDescriptionForNode(expr), content, parentStringPart);
+                                return makeHover(hoverTitle('Tag', "&lt;" + (closing ? "/" : "") + printLoreline(expr) + "&gt;"), hoverDescriptionForNode(expr), content, parentStringPart);
                         }
                     }
 
diff --git a/src/loreline/test/TestRunner.hx b/src/loreline/test/TestRunner.hx
@@ -81,7 +81,7 @@ class TestRunner {
         }
         for (t in 0...tags.length) {
             final tag = tags[t];
-            if (tag.offset > len) {
+            if (tag.offset >= len) {
                 textBuf.addChar("<".code);
                 textBuf.addChar("<".code);
                 if (tag.closing) {
diff --git a/test/Characters-Advanced.lor b/test/Characters-Advanced.lor
@@ -0,0 +1,46 @@
+
+character barista
+  name: Alex
+  friendliness: 3
+  expertise: high
+
+character customer
+  name: Jamie
+  firstVisit: true
+  favoriteDrink: "Americano"
+
+// Testing character property interpolation
+This coffee shop is run by $barista.name who has $barista.friendliness friendliness points.
+
+// Testing character property in conditionals
+if barista.expertise == "high"
+  barista: I've been making coffee for 10 years now.
+else
+  barista: I'm still learning the craft.
+
+// Testing character name resolution with name property
+$barista greets you with a smile.
+
+$customer looks around nervously.
+
+// Testing character property update
+if customer.firstVisit
+  barista: Welcome to our shop! First time here?
+  customer.firstVisit = false
+else
+  barista: Welcome back! Would you like your usual $customer.favoriteDrink?
+
+/*
+<test>
+- expected: |
+    ~ This coffee shop is run by Alex who has 3 friendliness points.
+
+    Alex: I've been making coffee for 10 years now.
+
+    ~ Alex greets you with a smile.
+
+    ~ Jamie looks around nervously.
+
+    Alex: Welcome to our shop! First time here?
+</test>
+*/
diff --git a/test/Functions-Basic.lor b/test/Functions-Basic.lor
@@ -1,11 +1,13 @@
 
+// Create a function with simple arithmetics
 function add(a, b)
   return a + b
 
 state
   apples: 7
   oranges: 3
 
+// Call the function with state values as arguments and display the result in text
 We have $apples apples and $oranges oranges, which makes a total of $add(apples, oranges) fruits!
 
 /*
diff --git a/test/Tags-Formatting.lor b/test/Tags-Formatting.lor
@@ -0,0 +1,62 @@
+
+character barista
+  name: Alex
+
+character customer
+  name: Jamie
+
+// Testing basic tags
+barista: <happy>Great to see you again!</happy>
+
+// Testing nested tags
+barista: <excited><loud>WELCOME BACK!</loud> It's been a while.</excited>
+
+// Testing space between text and tags (space should be ignored)
+barista: <slightly confused> Didn't you order something different last time?
+
+// Testing space between text and tags in double quotes (space should be preserved)
+barista: "<relaxed> Well, nevermind!"
+
+// Testing tags in narrative text
+The espresso machine <whirs>makes a pleasant humming sound</whirs> as the <steam>hot vapor rises</steam>.
+
+// Testing tags with interpolation
+barista: <knows $customer.name>Oh hey, $customer.name! Your usual?
+
+/* Testing tags in multiline dialogue: there should be
+   no space between them and the actual text content */
+barista:
+  <professional>
+  Let me explain our seasonal offerings.
+  We have three new blends this month.
+  Each one has unique characteristics.
+  </professional>
+
+/* Another multiline dialogue where white spaces between tags should be preserved */
+barista: "<enthusiastic>
+I personally recommend our Ethiopian roast.
+It has bright notes of citrus and chocolate.
+Perfect for an afternoon pick-me-up!
+</enthusiastic>"
+
+/*
+<test>
+- expected: |
+    Alex: <<happy>>Great to see you again!<</happy>>
+
+    Alex: <<excited>><<loud>>WELCOME BACK!<</loud>> It's been a while.<</excited>>
+
+    Alex: <<slightly confused>>Didn't you order something different last time?
+
+    Alex: <<relaxed>> Well, nevermind!
+
+    ~ The espresso machine <<whirs>>makes a pleasant humming sound<</whirs>> as the <<steam>>hot vapor rises<</steam>>.
+
+    Alex: <<knows Jamie>>Oh hey, Jamie! Your usual?
+
+    Alex:
+      <<professional>>Let me explain our seasonal offerings.
+      We have three new blends this month.
+      Each one has unique characteristics.<</professional>>
+</test>
+*/

Original file line number	Diff line number	Diff line change
`@@ -1488,7 +1488,7 @@ class Server {`
`1488`	`1488`	`case Expr(expr):`
`1489`	`1489`	`return makeNodeHover(lorelinePos, lens, uri, content, expr);`
`1490`	`1490`	`case Tag(closing, expr):`
`1491`		`- return makeHover(hoverTitle('Tag', "<" + printLoreline(expr) + ">"), hoverDescriptionForNode(expr), content, stringPart);`
	`1491`	`+ return makeHover(hoverTitle('Tag', "<" + (closing ? "/" : "") + printLoreline(expr) + ">"), hoverDescriptionForNode(expr), content, stringPart);`
`1492`	`1492`	`}`
`1493`	`1493`
`1494`	`1494`	`final literal = lens.getFirstParentOfType(node, NStringLiteral);`
`@@ -1502,7 +1502,7 @@ class Server {`
`1502`	`1502`	`case Expr(expr):`
`1503`	`1503`	`return makeNodeHover(lorelinePos, lens, uri, content, expr);`
`1504`	`1504`	`case Tag(closing, expr):`
`1505`		`- return makeHover(hoverTitle('Tag', "<" + printLoreline(expr) + ">"), hoverDescriptionForNode(expr), content, parentStringPart);`
	`1505`	`+ return makeHover(hoverTitle('Tag', "<" + (closing ? "/" : "") + printLoreline(expr) + ">"), hoverDescriptionForNode(expr), content, parentStringPart);`
`1506`	`1506`	`}`
`1507`	`1507`	`}`
`1508`	`1508`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class TestRunner {`
`81`	`81`	`}`
`82`	`82`	`for (t in 0...tags.length) {`
`83`	`83`	`final tag = tags[t];`
`84`		`- if (tag.offset > len) {`
	`84`	`+ if (tag.offset >= len) {`
`85`	`85`	`textBuf.addChar("<".code);`
`86`	`86`	`textBuf.addChar("<".code);`
`87`	`87`	`if (tag.closing) {`