Merge branch 'expr-literal' into 'main'

language: Add expression literals

See merge request jwestman/blueprint-compiler!227

blueprintcompiler/formatter.py

@@ -146,10 +146,8 @@ def format(data, tab_size=2, insert_space=True):
                 is_child_type = False
 
             elif str_item in CLOSING_TOKENS:
-                if str_item == "]" and str(last_not_whitespace) != "[":
+                if str_item == "]" and last_not_whitespace != ",":
                     current_line = current_line[:-1]
-                    if str(last_not_whitespace) != ",":
-                        current_line += ","
                     commit_current_line()
                     current_line = "]"
                 elif str(last_not_whitespace) in OPENING_TOKENS:

blueprintcompiler/language/values.py

@@ -487,14 +487,6 @@ class ArrayValue(AstNode):
                                 range=quoted_literal.range,
                             )
                         )
-                elif isinstance(value.child, Translated):
-                    errors.append(
-                        CompileError(
-                            "Arrays can't contain translated strings",
-                            range=value.child.range,
-                        )
-                    )
-
             if len(errors) > 0:
                 raise MultipleErrors(errors)
 

blueprintcompiler/lsp.py

@@ -118,7 +118,6 @@ class LanguageServer:
         self.client_capabilities = {}
         self.client_supports_completion_choice = False
         self._open_files: T.Dict[str, OpenFile] = {}
-        self._exited = False
 
     def run(self):
         # Read <doc> tags from gir files. During normal compilation these are
@@ -126,7 +125,7 @@ class LanguageServer:
         xml_reader.PARSE_GIR.add("doc")
 
         try:
-            while not self._exited:
+            while True:
                 line = ""
                 content_len = -1
                 while content_len == -1 or (line != "\n" and line != "\r\n"):
@@ -222,14 +221,6 @@ class LanguageServer:
             },
         )
 
-    @command("shutdown")
-    def shutdown(self, id, params):
-        self._send_response(id, None)
-
-    @command("exit")
-    def exit(self, id, params):
-        self._exited = True
-
     @command("textDocument/didOpen")
     def didOpen(self, id, params):
         doc = params.get("textDocument")

tests/formatting/lists_in.blp

@@ -1,21 +0,0 @@
-using Gtk 4.0;
-
-Box {
-  styles []
-}
-
-Box {
-  styles ["a"]
-}
-
-Box {
-  styles ["a",]
-}
-
-Box {
-  styles ["a", "b"]
-}
-
-Box {
-  styles ["a", "b",]
-}

tests/formatting/lists_out.blp

@@ -1,31 +0,0 @@
-using Gtk 4.0;
-
-Box {
-  styles []
-}
-
-Box {
-  styles [
-    "a",
-  ]
-}
-
-Box {
-  styles [
-    "a",
-  ]
-}
-
-Box {
-  styles [
-    "a",
-    "b",
-  ]
-}
-
-Box {
-  styles [
-    "a",
-    "b",
-  ]
-}

tests/formatting/out.blp

@@ -11,7 +11,7 @@ Overlay {
     notify::icon-name => $on_icon_name_changed(label) swapped;
 
     styles [
-      "destructive",
+      "destructive"
     ]
   }
 

tests/sample_errors/translated_string_array.blp

@@ -1,7 +0,0 @@
-using Gtk 4.0;
-
-StringList {
-  strings: [
-    _("Test")
-  ];
-}

tests/sample_errors/translated_string_array.err

@@ -1 +0,0 @@
-5,5,9,Arrays can't contain translated strings

tests/samples/string_array.blp

@@ -5,6 +5,6 @@ AboutDialog about {
 
   authors: [
     "Jane doe <jane-doe@email.com>",
-    "Jhonny D <jd@email.com>",
+    "Jhonny D <jd@email.com>"
   ];
 }

tests/samples/style.blp

@@ -3,6 +3,6 @@ using Gtk 4.0;
 Label {
   styles [
     "class-1",
-    "class-2",
+    "class-2"
   ]
 }

tests/test_formatter.py

@@ -47,4 +47,3 @@ class TestFormatter(unittest.TestCase):
         self.assert_format_test("correct1.blp", "correct1.blp")
         self.assert_format_test("string_in.blp", "string_out.blp")
         self.assert_format_test("comment_in.blp", "comment_out.blp")
-        self.assert_format_test("lists_in.blp", "lists_out.blp")