diff --git a/.github/workflows/build-artifacts.yml b/.github/workflows/build-artifacts.yml index d6785d7..a7150f5 100644 --- a/.github/workflows/build-artifacts.yml +++ b/.github/workflows/build-artifacts.yml @@ -25,11 +25,13 @@ jobs: run: | chmod +x ./scripts/compile-grammar.sh ./scripts/compile-grammar.sh + shell: bash - name: Compile Coverage Badge SVG run: | sudo apt-get install -y xsltproc make -B $(pwd)/images/coverage-badge.svg + shell: bash - name: Import GPG key id: import-gpg @@ -45,6 +47,7 @@ jobs: echo "fingerprint: ${{ steps.import-gpg.outputs.fingerprint }}" echo "username: ${{ steps.import-gpg.outputs.name }}" echo "email: ${{ steps.import-gpg.outputs.email }}" + shell: bash - name: Auto-commit changes id: auto-commit-action @@ -54,9 +57,12 @@ jobs: branch: main commit_options: '--no-verify --signoff -S' file_pattern: 'syntaxes/* images/*' + author_user_name: "${{ steps.import-gpg.outputs.name }}" + author_user_email: "${{ steps.import-gpg.outputs.email }}" commit_user_name: "${{ steps.import-gpg.outputs.name }}" commit_user_email: "${{ steps.import-gpg.outputs.email }}" - name: Run if changes have been detected if: steps.auto-commit-action.outputs.changes_detected == 'true' run: echo "New TextMate grammar was published" + shell: bash diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index fb197f3..9d817a7 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -14,6 +14,7 @@ jobs: run: | brew install pre-commit jsonlint yamllint shellcheck vagrant plugin install vagrant-disksize + shell: bash - name: Checkout uses: actions/checkout@v4 @@ -33,6 +34,8 @@ jobs: - name: Show pre-commit logs if: failure() run: cat ~/.cache/pre-commit/pre-commit.log + shell: bash - name: Show pre-commit version run: pre-commit --version + shell: bash diff --git a/src/operators.YAML-tmLanguage b/src/operators.YAML-tmLanguage index ebcaf82..12771f4 100644 --- a/src/operators.YAML-tmLanguage +++ b/src/operators.YAML-tmLanguage @@ -44,5 +44,9 @@ repository: match: "(\\')(?!\\b)" name: keyword.operator.derivative.parigp - - match: '(\#)\b\s*(?!$)' - name: keyword.operator.cardinality.parigp + match: '(\#)(\s*)(?!$)' + captures: + 1: + name: keyword.operator.cardinality.parigp + 2: + name: constant.character.whitespace.parigp diff --git a/tests/operators.test.gp b/tests/operators.test.gp index 1467f28..917b016 100644 --- a/tests/operators.test.gp +++ b/tests/operators.test.gp @@ -101,3 +101,12 @@ ## ^^ source.parigp keyword.operator.shift.parigp ## ^ source.parigp constant.numeric.int.parigp ## ^ source.parigp markup.punctuation.statement-terminator.parigp + + # [1, 2, 3] +##^ source.parigp keyword.operator.cardinality.parigp +## ^ source.parigp constant.character.whitespace.parigp +## ^ source.parigp meta.brackets.parigp punctuation.section.brackets.begin.parigp +## ^ ^ ^ source.parigp meta.brackets.parigp constant.numeric.int.parigp +## ^ ^ source.parigp meta.brackets.parigp markup.punctuation.separator.parigp +## ^ ^ source.parigp meta.brackets.parigp constant.character.whitespace.parigp +## ^ source.parigp meta.brackets.parigp punctuation.section.brackets.end.parigp