textmate-grammar-python 0.1.1__tar.gz → 0.1.2__tar.gz

{textmate_grammar_python-0.1.1 → textmate_grammar_python-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: textmate-grammar-python
-Version: 0.1.1
+Version: 0.1.2
 Summary: An interpreter for grammar files as defined by TextMate and used in VSCode, implemented in Python. TextMate grammars use the oniguruma dialect (https://github.com/kkos/oniguruma). Supports loading grammar files from JSON, PLIST, or YAML format.
 Home-page: https://github.com/watermarkhu/textmate-grammar-python
 License: MIT
@@ -92,22 +92,14 @@ Install the repository after cloning with [poetry](https://python-poetry.org/)
 > poetry install
 ```
 
-Setup nodejs dependencies in the regression testing folder.
+Run unit tests
 ```bash
-> cd test/regression
-> bash install.js
+> tox run
 ```
 
-Run all tests in main test directory
+Run regression testing against vscode-textmate (will install npm and required packages)
 ```bash
-> cd ..
-> pytest
-
-====================== test session starts =====================
-platform linux -- Python 3.11.4, pytest-7.4.0, pluggy-1.2.0
-rootdir: /home/watermarkhu/repositories/sphinx-matlab/test
-plugins: icdiff-0.8
-...
+> tox run -e regression
 ```
 
 

{textmate_grammar_python-0.1.1 → textmate_grammar_python-0.1.2}/README.md

@@ -73,21 +73,13 @@ Install the repository after cloning with [poetry](https://python-poetry.org/)
 > poetry install
 ```
 
-Setup nodejs dependencies in the regression testing folder.
+Run unit tests
 ```bash
-> cd test/regression
-> bash install.js
+> tox run
 ```
 
-Run all tests in main test directory
+Run regression testing against vscode-textmate (will install npm and required packages)
 ```bash
-> cd ..
-> pytest
-
-====================== test session starts =====================
-platform linux -- Python 3.11.4, pytest-7.4.0, pluggy-1.2.0
-rootdir: /home/watermarkhu/repositories/sphinx-matlab/test
-plugins: icdiff-0.8
-...
+> tox run -e regression
 ```
 

{textmate_grammar_python-0.1.1 → textmate_grammar_python-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "textmate-grammar-python"
-version = "0.1.1"
+version = "0.1.2"
 description = "An interpreter for grammar files as defined by TextMate and used in VSCode, implemented in Python. TextMate grammars use the oniguruma dialect (https://github.com/kkos/oniguruma). Supports loading grammar files from JSON, PLIST, or YAML format."
 authors = ["Mark Shui Hu <watermarkhu@gmail.com>"]
 license = "MIT"
@@ -17,6 +17,7 @@ PyYAML = "^6.0.1"
 [tool.poetry.group.test.dependencies]
 pytest = "^7.3.1"
 pytest-icdiff = "^0.8"
+tox = "^4.11.4"
 
 [build-system]
 requires = ["poetry-core"]

{textmate_grammar_python-0.1.1 → textmate_grammar_python-0.1.2}/textmate_grammar/grammars/matlab/grammar.yaml

@@ -18,7 +18,7 @@ repository:
     beginCaptures:
       '1':
         name: punctuation.definition.function.anonymous.matlab
-    end: (?=;|(?<!(?:\.\.\..*))\n|%)
+    end: (?=;|(?<!(?:\.{3}.*))\n|%)
     name: meta.function.anonymous.matlab
     patterns:
     - begin: \G(\()
@@ -40,7 +40,7 @@ repository:
       beginCaptures:
         '1':
           name: punctuation.section.group.begin.matlab
-      end: (\))?[^\S\n]*(?=;|(?<!(?:\.\.\..*))\n|%)
+      end: (\))?[^\S\n]*(?=;|(?<!(?:\.{3}.*))\n|%)
       endCaptures:
         '1':
           name: punctuation.section.group.end.matlab
@@ -62,7 +62,7 @@ repository:
       name: meta.for.matlab
       patterns:
       - begin: \G(?!$)
-        end: (?<!\.\.\.)(?:(?=([,;])(?![^(]*\)))|$)
+        end: (?<!\.{3})(?:(?=([,;])(?![^(]*\)))|$)
         name: meta.for.declaration.matlab
         patterns:
         - include: $self
@@ -81,7 +81,7 @@ repository:
       name: meta.if.matlab
       patterns:
       - begin: \G(?!$)
-        end: (?<!\.\.\.)(?:(?=([,;])(?![^(]*\)))|$)
+        end: (?<!\.{3})(?:(?=([,;])(?![^(]*\)))|$)
         name: meta.if.declaration.matlab
         patterns:
         - include: $self
@@ -92,7 +92,7 @@ repository:
         name: meta.elseif.matlab
         patterns:
         - begin: \G(?!$)
-          end: (?<!\.\.\.)(?:(?=([,;])(?![^(]*\)))|$)
+          end: (?<!\.{3})(?:(?=([,;])(?![^(]*\)))|$)
           name: meta.elseif.declaration.matlab
           patterns:
           - include: $self
@@ -114,7 +114,7 @@ repository:
       name: meta.for.parallel.matlab
       patterns:
       - begin: \G(?!$)
-        end: (?<!\.\.\.)(?:(?=([,;])(?![^(]*\)))|$)
+        end: (?<!\.{3})(?:(?=([,;])(?![^(]*\)))|$)
         name: meta.for.parallel.declaration.matlab
         patterns:
         - include: $self
@@ -130,7 +130,7 @@ repository:
       name: meta.repeat.parallel.matlab
       patterns:
       - begin: \G(?!$)
-        end: (?<!\.\.\.)(?:(?=([,;])(?![^(]*\)))|$)
+        end: (?<!\.{3})(?:(?=([,;])(?![^(]*\)))|$)
         name: meta.repeat.parallel.declaration.matlab
         patterns:
         - include: $self
@@ -152,11 +152,11 @@ repository:
             name: keyword.control.switch.case.matlab
           '3':
             begin: \G(?!$)
-            end: (?<!\.\.\.)(?:(?=([,;])(?![^(]*\)))|$)
+            end: (?<!\.{3})(?:(?=([,;])(?![^(]*\)))|$)
             name: meta.case.declaration.matlab
             patterns:
             - include: $self
-        match: (\s*)(?<=^|[\s,;])(case)\b(.*?)(?<!\.\.\.)(?:(?=([,;])(?![^(]*\)))|$)
+        match: (\s*)(?<=^|[\s,;])(case)\b(.*?)(?<!\.{3})(?:(?=([,;])(?![^(]*\)))|$)
         name: meta.case.matlab
       - captures:
           '2':
@@ -196,7 +196,7 @@ repository:
       name: meta.while.matlab
       patterns:
       - begin: \G
-        end: (?<!\.\.\.)(?:(?=([,;])(?![^(]*\)))|$)
+        end: (?<!\.{3})(?:(?=([,;])(?![^(]*\)))|$)
         endCaptures:
           '1':
             include: $self
@@ -235,7 +235,7 @@ repository:
       name: meta.class.matlab
       patterns:
       - begin: \G
-        end: (?<!\.\.\.)(?=\n)
+        end: (?<!\.{3})(?=\n)
         name: meta.class.declaration.matlab
         patterns:
         - begin: \G(\([^)]*\))?\s*
@@ -262,14 +262,14 @@ repository:
                 - include: '#string'
               - include: '#comments'
               - include: '#line_continuation'
-          end: (?<!\.\.\.)(?=\s*%|\n)
+          end: (?<!\.{3})(?=\s*%|\n)
           patterns:
           - begin: \G\s*([a-zA-Z][a-zA-Z0-9_]*)
             beginCaptures:
               '1':
                 comment: Class name
                 name: entity.name.type.class.matlab
-            end: (?<!\.\.\.)(?=\n)
+            end: (?<!\.{3})(?=\n)
             patterns:
             - comment: Optional inheritance operator
               match: <
@@ -414,7 +414,7 @@ repository:
         - include: '#string_quoted_single'
     comment: "\t\t\t\t\t  1 \t\t\t\t   2\t\t3 \t\t\t\t   4\t\t\t\t\t\t\t\t\t\t\t\t\
       \t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t   "
-    match: (?<=^|[^.]\n|;|,|=)([^\S\n]*)(?# A> )(\b\w+\b)([^\S\n]+)(?# B> )((?!(\+|-|\*|\.\*|\/|\.\/|\\|\.\\|\^|\.\^|==|~=|&|&&|\||\|\||=|:|>|>=|<|<=|\.\.\.)[^\S\n]?)[^\s({=;%][^\n;%]*)
+    match: (?<=^|[^.]\n|;|,|=)([^\S\n]*)(?# A> )(\b\w+\b)([^\S\n]+)(?# B> )((?!(\+|-|\*|\.\*|\/|\.\/|\\|\.\\|\^|\.\^|==|~=|&|&&|\||\|\||=|:|>|>=|<|<=|\.{3})[^\S\n]?)[^\s({=;%][^\n;%]*)
     name: meta.function-call.command.matlab
   comment_block:
     begin: (^[\s]*)(%\{)[^\S\n]*+\n
@@ -525,10 +525,10 @@ repository:
       name: meta.function.matlab
       patterns:
       - begin: \G
-        end: (?<=[\)\n])
+        end: (?<=\))|(?>(?<!\.{3}.*)\n)
         name: meta.function.declaration.matlab
         patterns:
-        - begin: \G(?=.*?=)
+        - begin: \G(?=[^\(]*?(?:=|\[|\.{3}))
           comment: Function output
           contentName: meta.assignment.variable.output.matlab
           end: \s*(=)\s*
@@ -541,21 +541,21 @@ repository:
           - captures:
               '1':
                 name: punctuation.section.assignment.group.end.matlab
-            match: (\])\s*\z
+            match: (\])\s*
           - match: '[a-zA-Z][a-zA-Z0-9_]*'
             name: variable.parameter.output.matlab
           - match: ','
             name: punctuation.separator.parameter.comma.matlab
-          - include: '#comments'
           - include: '#line_continuation'
+          - include: '#comments'
         - comment: Function name
-          match: '[a-zA-Z][a-zA-Z0-9_.]*(?=[^a-zA-Z0-9_.])'
+          match: '[a-zA-Z][a-zA-Z0-9_]*(?>\.[a-zA-Z0-9_]+)*'
           name: entity.name.function.matlab
           patterns:
           - match: \.
             name: punctuation.accessor.dot.matlab
           - include: '#line_continuation'
-        - begin: (?<=[a-zA-Z0-9_])\s*\(
+        - begin: \s*\(
           beginCaptures:
             '0':
               name: punctuation.definition.parameters.begin.matlab
@@ -574,6 +574,7 @@ repository:
             name: punctuation.separator.parameter.comma.matlab
           - include: '#comments'
           - include: '#line_continuation'
+        - include: '#line_continuation'
         - include: '#comments'
       - begin: "(?x)\n\t\t\t\t\t\t\t\t\t(^\\s*)\t\t\t\t\t\t\t\t# Leading whitespace\n\
           \t\t\t\t\t\t\t\t\t(arguments)\\b([^%]*)\n\t\t\t\t\t\t\t\t\t\\s*\n\t\t\t\t\
@@ -617,7 +618,7 @@ repository:
     comment: "\n\t\t\t\tFunction call; matrix or array index (subscript)\n\t\t\t\t\
       We don't include $self here to avoid matching command syntax inside (), [],\
       \ {}\n\t\t\t"
-    end: (\)|(?<!\.\.\..*)\n)
+    end: (\)|(?<!\.{3}.*)\n)
     endCaptures:
       '0':
         name: punctuation.section.parens.end.matlab
@@ -658,7 +659,7 @@ repository:
         name: punctuation.section.parens.begin.matlab
     comment: Index array with expression evaluated to variable name or number
     contentName: meta.parens.matlab
-    end: (\)|(?<!\.\.\..*)\n)
+    end: (\)|(?<!\.{3}.*)\n)
     endCaptures:
       '0':
         name: punctuation.section.parens.end.matlab
@@ -673,7 +674,7 @@ repository:
         - include: '#variables'
     comment: We don't include $self here to avoid matching command syntax inside (),
       [], {}
-    end: (\}|(?<!\.\.\..*)\n)
+    end: (\}|(?<!\.{3}.*)\n)
     patterns:
     - include: '#end_in_parentheses'
     - include: '#rules_before_command_dual'
@@ -685,7 +686,7 @@ repository:
       '2':
         name: comment.continuation.line.matlab
     comment: Line continuations
-    match: (\.\.\.)(.*)$
+    match: (\.{3})(.*)$
     name: meta.continuation.line.matlab
   multiple_assignment:
     begin: \[(?=[^\]]+\]\s*=[a-zA-Z0-9_\s(])
@@ -740,19 +741,19 @@ repository:
       match: (?<!\w)\?(?=\w)
       name: keyword.operator.other.question.matlab
     - comment: Arithmetic operator symbols
-      match: (?<=[a-zA-Z0-9\s])(\+|-|\*|\.\*|/|\./|\\|\.\\|\^|\.\^)(?=[a-zA-Z0-9\s]|(?:\.\.\.))
+      match: (?<=[a-zA-Z0-9\s])(\+|-|\*|\.\*|/|\./|\\|\.\\|\^|\.\^)(?=[a-zA-Z0-9\s]|(?:\.{3}))
       name: keyword.operator.arithmetic.matlab
     - comment: Operator symbols
-      match: (?<=[a-zA-Z0-9\s])(==|~=|&|&&|\||\|\|)(?=[a-zA-Z0-9\s]|(?:\.\.\.))
+      match: (?<=[a-zA-Z0-9\s])(==|~=|&|&&|\||\|\|)(?=[a-zA-Z0-9\s]|(?:\.{3}))
       name: keyword.operator.logical.matlab
     - comment: Assignment operator
       match: (?<=[a-zA-Z0-9\s])(=)(?!=)
       name: keyword.operator.assignment.matlab
     - comment: Colon operator for vector creation/indexing
-      match: (?<=[a-zA-Z0-9_\s(){,]|^):(?=[a-zA-Z0-9_\s()},]|$||(?:\.\.\.))
+      match: (?<=[a-zA-Z0-9_\s(){,]|^):(?=[a-zA-Z0-9_\s()},]|$||(?:\.{3}))
       name: keyword.operator.vector.colon.matlab
     - comment: Comparative operators
-      match: (?<=[a-zA-Z0-9\s])(>|>=|<|<=)(?=[a-zA-Z0-9\s]|(?:\.\.\.))
+      match: (?<=[a-zA-Z0-9\s])(>|>=|<|<=)(?=[a-zA-Z0-9\s]|(?:\.{3}))
       name: keyword.operator.relational.matlab
   parentheses:
     begin: \(
@@ -762,7 +763,7 @@ repository:
     comment: "\n\t\t\t\tOperator precedence in expressions\n\t\t\t\tWe don't include\
       \ $self here to avoid matching command syntax inside (), [], {}\n\t\t\t"
     contentName: meta.parens.matlab
-    end: (\)|(?<!\.\.\..*)\n)
+    end: (\)|(?<!\.{3}.*)\n)
     endCaptures:
       '0':
         name: punctuation.section.parens.end.matlab
@@ -935,7 +936,7 @@ repository:
     comment: "\n\t\t\t\tSuperclass method call; matrix or array index (subscript)\n\
       \t\t\t\tWe don't include $self here to avoid matching command syntax inside\
       \ (), [], {}\n\t\t\t"
-    end: (\)|(?<!\.\.\..*)\n)
+    end: (\)|(?<!\.{3}.*)\n)
     endCaptures:
       '0':
         name: punctuation.section.parens.end.matlab

{textmate_grammar_python-0.1.1 → textmate_grammar_python-0.1.2}/textmate_grammar/handler.py

@@ -1,4 +1,4 @@
-from onigurumacffi import _Pattern as Pattern, _Match as Match
+from onigurumacffi import _Pattern as Pattern, _Match as Match, compile
 
 from .logging import LOGGER
 from .exceptions import FileNotFound, ImpossibleSpan
@@ -16,6 +16,7 @@ class ContentHandler(object):
     are index by a tuple (line_number, line_position). Additionally, the handler contains the
     search method to match a search span against a input oniguruma regex pattern.
     """
+    notLookForwardEOL = compile("(?<!\(\?=[^\(]*)\$")
 
     def __init__(self, source: str) -> None:
         self.source = source
@@ -201,7 +202,7 @@ class ContentHandler(object):
             LOGGER.warning(f"skipping < {leading_string} >", position=start_pos, depth=kwargs.get("depth", 0))
 
         # Include \n in match span if pattern matches on end of line $
-        if "$" in pattern._pattern and matching.end() + 1 == self.line_lengths[starting[0]]:
+        if self.notLookForwardEOL.search(pattern._pattern) and matching.end() + 1 == self.line_lengths[starting[0]]:
             newline_matching = pattern.search(line[:-1])
             if newline_matching and newline_matching.span() == matching.span():
                 close_pos = (starting[0], matching.end() + 1)

{textmate_grammar_python-0.1.1 → textmate_grammar_python-0.1.2}/textmate_grammar/parser.py

@@ -349,8 +349,21 @@ class PatternsParser(ParserHasPatterns):
                     LOGGER.info(
                         f"{self.__class__.__name__} chosen pattern of {parser}", self, current, kwargs.get("depth", 0)
                     )
-                else:
+                elif self != self.language:
                     break
+                else:
+                    remainder = handler.read_line(current)
+                    if not remainder.isspace():
+                        LOGGER.warning(
+                            f"{self.__class__.__name__} remainder of line not parsed: {remainder}", self, current, kwargs.get("depth", 0)
+                        )
+                    if current[0] + 1 <= len(handler.lines):
+                        current = (current[0] + 1, 0)
+                    else:
+                        LOGGER.debug(
+                            f"{self.__class__.__name__} EOF encountered", self, current, kwargs.get("depth", 0)
+                        )
+                        break
 
             if current == starting:
                 LOGGER.warning(
@@ -370,13 +383,12 @@ class PatternsParser(ParserHasPatterns):
                     break
 
         if self.token:
-            closing = boundary if starting == current else current
             elements = [
                 ContentElement(
                     token=self.token,
                     grammar=self.grammar,
-                    content=handler.read_pos(starting, closing),
-                    characters=handler.chars(starting, closing),
+                    content=handler.read_pos(starting, boundary),
+                    characters=handler.chars(starting, boundary),
                     children=elements,
                 )
             ]