Various fixes related to multiline text

Author: jeremyfa

README.md

@@ -2,6 +2,8 @@
 
 Loreline is an open-source scripting language for writing interactive fictions.
 
+![Screenshot of the Loreline extension for VSCode](/vscode-screenshot.png)
+
 Here's a most basic example of Loreline script:
 
 ```lor
@@ -379,3 +381,27 @@ Loreline.play(
 ```
 
 You can also take a look at [Cli.hx](/cli/loreline/Cli.hx) source code as another reference using Loreline.
+
+## License
+
+MIT License
+
+Copyright (c) 2025 Jérémy Faivre
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

run.n

@@ -2295,16 +2295,23 @@ class InterpreterOptions {
         var offset = 0;
 
         var keepWhitespace = (str.quotes != Unquoted);
+        var keepIndents = (str.quotes != Unquoted);
+        var keepComments = (str.quotes != Unquoted);
 
         for (i in 0...str.parts.length) {
             final part = str.parts[i];
 
             switch (part.partType) {
                 case Raw(text):
                     if (!keepWhitespace) {
-                        text = stripStringIndent(text);
+                        text = text.ltrim();
+                    }
+                    if (!keepComments) {
                         text = stripStringComments(text);
                     }
+                    if (!keepIndents) {
+                        text = stripStringIndent(text);
+                    }
                     final len = text.uLength();
                     if (len > 0) keepWhitespace = true;
                     var prevIsDollar:Bool = false;

src/loreline/Interpreter.hx

@@ -2446,17 +2446,24 @@ class Token {
                         // Only valid if the indentation is identical
                         final followingText = tryReadUnquotedString();
                         if (followingText != null) {
+                            final between = input.uSubstring(savedPos - rtrimmedOffset, afterWhitespaceAndCommentsPos);
                             switch followingText.type {
                                 case LString(_, s_, attachments_):
                                     if (attachments_ != null) {
                                         for (attachment in attachments_) {
                                             attachments.push(attachment);
                                         }
                                     }
-                                    content += input.uSubstring(savedPos - rtrimmedOffset, afterWhitespaceAndCommentsPos);
+                                    content += between;
                                     content += s_;
                                 case _:
                             }
+                            rtrimmedOffset = 0;
+                            var n = pos - 1;
+                            while (n >= 0 && input.uCharCodeAt(n) == " ".code || input.uCharCodeAt(n) == "\t".code) {
+                                rtrimmedOffset++;
+                                n--;
+                            }
                         }
                         else {
                             line = savedLine;

src/loreline/Lexer.hx

@@ -260,6 +260,8 @@ class Cli {
 
         if (character != null) {
 
+            final multiline = text.contains("\n");
+
             character = interpreter.getCharacterField(character, 'name') ?? character;
 
             var tagItems = [];
@@ -270,7 +272,13 @@ class Cli {
             }
             var tagItemsText = "";
             if (tagItems.length > 0) {
-                tagItemsText = tagItems.join("") + " ";
+                tagItemsText = tagItems.join("");
+                if (!multiline) {
+                    tagItemsText += " ";
+                }
+            }
+            if (multiline) {
+                text = "\n  " + text.replace("\n", "\n  ").rtrim();
             }
             type(
                 " " + (character + ":").cyan().bold() + " " + tagItemsText + text.green()

src/loreline/cli/Cli.hx

@@ -1238,13 +1238,23 @@ class Server {
 
     function makeRawTextHover(cursorLorelinePos:loreline.Position, title:String, description:Array<String>, content:String, part:NStringPart, ?pos:loreline.Position):Hover {
 
+        var spaceOffset = 0;
+        if (pos == null) {
+            pos = part.pos;
+        }
+        else {
+            spaceOffset = pos.offset - part.pos.offset;
+        }
+
         switch part.partType {
             case Raw(text):
-                final offset = cursorLorelinePos.offset - part.pos.offset;
+                final offset = cursorLorelinePos.offset - pos.offset;
+                var first = true;
                 for (sub in extractTextSectionsExcludingComments(text)) {
-                    if (offset >= sub.offset && offset < sub.offset + sub.length) {
-                        return makeHover(title, description, content, part, part.pos.withOffset(content, sub.offset, sub.length));
+                    if (offset >= sub.offset && offset < sub.offset + sub.length - (first ? spaceOffset : 0)) {
+                        return makeHover(title, description, content, part, pos.withOffset(content, sub.offset - (first ? 0 : spaceOffset), sub.length - (first ? spaceOffset : 0)));
                     }
+                    first = false;
                 }
                 return null;
             case _:
@@ -1444,23 +1454,23 @@ class Server {
                         if (literal.parts.length == 1) {
                             switch literal.parts[0].partType {
                                 case Raw(text):
-                                    return makeRawTextHover(lorelinePos, hoverTitle('Text'), hoverDescriptionForNode(literal.parts[0]), content, stringPart, stringPart.pos.withOffset(content, -1, stringPart.pos.length + 2));
+                                    return makeHover(hoverTitle('Text'), hoverDescriptionForNode(literal.parts[0]), content, stringPart, stringPart.pos.withOffset(content, -1, stringPart.pos.length + 2));
                                 case Expr(expr):
                                 case Tag(closing, expr):
                             }
                         }
                         else if (partIndex == 0) {
                             switch literal.parts[0].partType {
                                 case Raw(text):
-                                    return makeRawTextHover(lorelinePos, hoverTitle('Text'), hoverDescriptionForNode(literal.parts[0]), content, stringPart, stringPart.pos.withOffset(content, -1, stringPart.pos.length + 1));
+                                    return makeHover(hoverTitle('Text'), hoverDescriptionForNode(literal.parts[0]), content, stringPart, stringPart.pos.withOffset(content, -1, stringPart.pos.length + 1));
                                 case Expr(expr):
                                 case Tag(closing, expr):
                             }
                         }
                         else if (partIndex == literal.parts.length - 1) {
                             switch literal.parts[literal.parts.length - 1].partType {
                                 case Raw(text):
-                                    return makeRawTextHover(lorelinePos, hoverTitle('Text'), hoverDescriptionForNode(literal.parts[literal.parts.length - 1]), content, stringPart, stringPart.pos.withOffset(content, 0, stringPart.pos.length + 1));
+                                    return makeHover(hoverTitle('Text'), hoverDescriptionForNode(literal.parts[literal.parts.length - 1]), content, stringPart, stringPart.pos.withOffset(content, 0, stringPart.pos.length + 1));
                                 case Expr(expr):
                                 case Tag(closing, expr):
                             }