fix: improve coverage + resolve bad rules ordering

piotr-semenov · May 3, 2024 · a881344 · a881344
1 parent 05696de
commit a881344
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -117,8 +117,9 @@ $(ROOT_DIR)images/coverage-badge.svg:
 	 xargs -n1 | sort | uniq))
 	$(eval SCOPES_UNDER_TEST := $(shell tail -n+2 $(ROOT_DIR)tests/*.test.gp |\
 	 grep -o 'source.parigp.*$$' |\
-	 xargs -n1 | sort | uniq))
+	 xargs -n1 | sort | uniq | grep -v source.parigp))
 	$(eval DIFF := $(shell echo $(REFS) $(SCOPES_UNDER_TEST) | tr ' ' '\n' | sort | uniq -u | xargs -n1))
+	@$(info $(DIFF))
 	$(eval COVERAGE := $(shell echo "scale=4 ; 100.0 * (1.0 - $(shell echo $(DIFF) | wc -w) / $(shell echo $(REFS) | wc -w))" | bc))
 	@xsltproc --param coverage $(COVERAGE) \
 	          --output $@ \

diff --git a/src/functions.YAML-tmLanguage.j2 b/src/functions.YAML-tmLanguage.j2
@@ -57,7 +57,10 @@ repository:
                         beginCaptures:
                             1:
                                 name: entity.name.function.user.member.parigp
-                        name: meta.function.member.parigp
+                        name: meta.function.user.member.parigp
+                        patterns:
+                            - include: '#general'
+                            - include: '#operators'
                 repository:
                     function-vars:
                         patterns:

diff --git a/src/operators.YAML-tmLanguage b/src/operators.YAML-tmLanguage
@@ -13,6 +13,9 @@ repository:
             -
                 match: '(?<!&)(&)'
                 name: keyword.operator.pointer.parigp
+            -
+                match: '(<<|>>)'
+                name: keyword.operator.shift.parigp
             -
                 match: '(<=|>=|<|(?<!\-)>|!=)'
                 name: keyword.operator.comparison.parigp
@@ -22,18 +25,15 @@ repository:
             -
                 match: '(=)'
                 name: keyword.operator.assignment.parigp
-            -
-                match: '(<<|>>)'
-                name: keyword.operator.shift.parigp
             -
                 match: '(\-\-|\+\+)'
                 name: keyword.operator.increment-decrement.parigp
-            -
-                match: '(\-|\+|\*|\/|\\|\\/|%)'
-                name: keyword.operator.arithmetic.parigp
             -
                 match: '(\+=|\-=|\*=|\/=|\\=|<<=|>>=)'
                 name: keyword.operator.arithmetic.assign.parigp
+            -
+                match: '(\-|\+|\*|\/|\\|\\/|%)'
+                name: keyword.operator.arithmetic.parigp
             -
                 match: '(\.\.)'
                 name: keyword.operator.range.parigp

diff --git a/tests/functions.test.gp b/tests/functions.test.gp
@@ -1,5 +1,17 @@
 ## SYNTAX TEST "source.parigp" "Functions"
 
+  -oo
+##^ source.parigp keyword.operator.arithmetic.parigp
+## ^^ source.parigp constant.language.parigp
+
+  x = Euler() * I
+##^ source.parigp variable.name.parigp
+## ^ ^ source.parigp constant.character.whitespace.parigp
+##  ^ source.parigp keyword.operator.assignment.parigp
+##    ^^^^^     ^ source.parigp constant.language.parigp
+##           ^ ^ source.parigp constant.character.whitespace.parigp
+##            ^ source.parigp keyword.operator.arithmetic.parigp
+
   Col([])
 ##^^^ source.parigp entity.name.function.builtins.parigp
 ##   ^ source.parigp meta.parens.parigp punctuation.section.parens.begin.parigp
@@ -315,11 +327,12 @@
 
   \\ Code from pages 39-40 of "User's Guide to PARI/GP"
 ##^^ source.parigp punctuation.definition.comment.parigp comment.line.double-slash.parigp
-  x.j = {
+  x.r = {
 ##^ source.parigp variable.name.parigp
-##  ^ source.parigp entity.name.function.member.builtins.parigp
-##   ^ ^ source.parigp constant.character.whitespace.parigp
-##    ^ source.parigp keyword.operator.assignment.parigp
+##  ^ source.parigp entity.name.function.user.member.parigp
+##   ^ source.parigp meta.function.user.member.parigp constant.character.whitespace.parigp
+##    ^ source.parigp meta.function.user.member.parigp keyword.operator.assignment.parigp
+##     ^ source.parigp constant.character.whitespace.parigp
 ##      ^ source.parigp meta.block.parigp punctuation.section.group.begin.parigp
     if (type(x) != "t_VEC" || length(x) < 14,
 ##  ^^ source.parigp meta.block.parigp entity.name.function.builtins.parigp

diff --git a/tests/other.test.gp b/tests/other.test.gp
@@ -19,3 +19,19 @@
 ##^^ source.parigp support.function.parigp
 ##  ^ source.parigp constant.character.whitespace.parigp
 ##   ^^^^^^^^^^^^ source.parigp constant.character.escape.parigp
+
+  x = 1;
+  x *= 10;
+##^ source.parigp variable.name.parigp
+## ^  ^ source.parigp constant.character.whitespace.parigp
+##  ^^ source.parigp keyword.operator.arithmetic.assign.parigp
+##     ^^ source.parigp constant.numeric.int.parigp
+##       ^ source.parigp markup.punctuation.statement-terminator.parigp
+
+  y = x >> 2;
+##^   ^ source.parigp variable.name.parigp
+## ^ ^ ^  ^ source.parigp constant.character.whitespace.parigp
+##  ^ source.parigp keyword.operator.assignment.parigp
+##      ^^ source.parigp keyword.operator.shift.parigp
+##         ^ source.parigp constant.numeric.int.parigp
+##          ^ source.parigp markup.punctuation.statement-terminator.parigp