python-fragments 0.7__tar.gz → 0.9__tar.gz

{python_fragments-0.7 → python_fragments-0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fragments
-Version: 0.7
+Version: 0.9
 Summary: Modern HTML template rendering in Python
 Author-email: The Running Algorithm <services@therunningalgorithm.info>
 License: Proprietary

{python_fragments-0.7 → python_fragments-0.9}/fragments/grammar.py

@@ -4,7 +4,6 @@ import re
 from fragments.ast_nodes import ASTFragment, ASTHTMLAttribute, ASTHTMLComment, ASTHTMLElement, ASTHTMLText, ASTInterpolation, ASTModule, ASTPython
 from fragments.source import Source
 
-PYTHON = r"([\s\S]*?)(?=<>)|[\s\S]*$"
 IDENTIFIER = r"[a-zA-Z_][a-zA-Z0-9_]*"
 STRING_CONTENTS = r"(.*?)(?=\")"
 HTML_IDENTIFIER = r"[a-zA-Z][a-zA-Z0-9_-]*"
@@ -56,8 +55,29 @@ def expect_module(source: Source) -> tuple[Source, ASTModule]:
 
 def expect_python(source: Source) -> tuple[Source, ASTPython]:
     """Vanilla Python code."""
+    PYTHON = r"([\s\S]*?)(?=<>|'''|\"\"\"|'|\"|#)|[\s\S]*$"
     source_start: int = source.offset
-    source, python = expect_regex(source, PYTHON, "python source")
+    python: str = ""
+
+    while not source.remaining().startswith("<>") and not source.at_end():
+        source, next_python = expect_regex(source, PYTHON, "python source")
+        python += next_python
+        if source.remaining().startswith('"""'):
+            source, next_python = expect_regex(source, r'"""([\s\S]*?)(?:"""|$)', "python source")
+            python += next_python
+        elif source.remaining().startswith("'''"):
+            source, next_python = expect_regex(source, r"'''([\s\S]*?)(?:'''|$)", "python source")
+            python += next_python
+        elif source.remaining().startswith("'"):
+            source, next_python = expect_regex(source, r"'(?:[^'\\]|\\.)*(?:'|$)", "python source")
+            python += next_python
+        elif source.remaining().startswith('"'):
+            source, next_python = expect_regex(source, r'"(?:[^"\\]|\\.)*(?:"|$)', "python source")
+            python += next_python
+        elif source.remaining().startswith("#"):
+            source, next_python = expect_regex(source, r"#[^\n]*", "python source")
+            python += next_python
+
     return source, ASTPython(source_start, source.offset, python)
 
 

{python_fragments-0.7 → python_fragments-0.9}/fragments/lsp/client_message_handlers/lifecycle.py

@@ -27,11 +27,7 @@ def publish_parse_error_diagnostics(uri: str) -> None:
     parse_error = based_proxy.PARSE_ERRORS.get(uri)
     if parse_error is not None:
         diagnostics.append(parse_error)
-    based_proxy.proxy().notify(
-        types.PublishDiagnosticsNotification(
-            params=types.PublishDiagnosticsParams(uri=uri, diagnostics=diagnostics)
-        )
-    )
+    based_proxy.proxy().notify(types.PublishDiagnosticsNotification(params=types.PublishDiagnosticsParams(uri=uri, diagnostics=diagnostics)))
 
 
 @handle_from_client(types.INITIALIZE)
@@ -58,7 +54,7 @@ async def did_open(message: REQUESTS | NOTIFICATIONS) -> None:
         file_state = FileState(document.text)
         based_proxy.PARSE_ERRORS[document.uri] = None
         FILE_STATES[document.uri] = file_state
-        document.text = file_state.transpiled
+        document.text = file_state.original if file_state.vanilla else file_state.transpiled
     except grammar.ParsingError as error:
         based_proxy.PARSE_ERRORS[document.uri] = _parse_error_diagnostic(document.text, error)
         publish_parse_error_diagnostics(document.uri)
@@ -79,7 +75,7 @@ async def did_change(message: REQUESTS | NOTIFICATIONS) -> None:
         file_state = FileState(text)
         based_proxy.PARSE_ERRORS[uri] = None
         FILE_STATES[uri] = file_state
-        notification.params.content_changes = [types.TextDocumentContentChangeWholeDocument(text=file_state.transpiled)]
+        notification.params.content_changes = [types.TextDocumentContentChangeWholeDocument(text=file_state.original if file_state.vanilla else file_state.transpiled)]
         if had_parse_error:
             publish_parse_error_diagnostics(uri)
     except grammar.ParsingError as error:

{python_fragments-0.7 → python_fragments-0.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-fragments"
-version = "0.7"
+version = "0.9"
 description = "Modern HTML template rendering in Python"
 authors = [{ name = "The Running Algorithm", email = "services@therunningalgorithm.info" }]
 readme = "README.md"

{python_fragments-0.7 → python_fragments-0.9}/python_fragments.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fragments
-Version: 0.7
+Version: 0.9
 Summary: Modern HTML template rendering in Python
 Author-email: The Running Algorithm <services@therunningalgorithm.info>
 License: Proprietary