Merge branch 'main' into fix-range-sel

Author: przepompownia

.github/workflows/check_query_files.yml

@@ -1,56 +1,40 @@
-name: Linting and style checking
+name: Lint
 
 on:
+  push:
+    branches:
+      - "main"
   pull_request:
     branches:
       - "main"
+  workflow_dispatch:
 
 jobs:
-  luacheck:
-    name: Luacheck
+  lua:
+    name: Lint Lua files
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - name: Prepare
+      - name: Format
         run: |
-          sudo apt-get update
-          sudo add-apt-repository universe
-          sudo apt install luarocks -y
-          sudo luarocks install luacheck
+          make formatlua
+          git diff --exit-code
 
-      - name: Run Luacheck
-        run: sudo ./scripts/style-check.sh
+      - name: Lint
+        run: make checklua
 
-  stylua:
-    name: StyLua
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Lint with stylua
-        uses: JohnnyMorganz/stylua-action@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          version: latest
-          args: --check .
-
-  format-queries:
-    name: Lint queries
+  queries:
+    name: Lint query files
     runs-on: ubuntu-latest
-    env:
-      NVIM_TAG: stable
     steps:
       - uses: actions/checkout@v4
-      - name: Prepare
-        run: |
-          bash ./scripts/ci-install-ubuntu-latest.sh
-          wget -P scripts/ https://raw.githubusercontent.com/nvim-treesitter/nvim-treesitter/main/scripts/format-queries.lua
-          mkdir -p ~/.local/share/nvim/site/pack/nvim-treesitter/start
-          cd ~/.local/share/nvim/site/pack/nvim-treesitter/start
-          git clone https://github.com/nvim-treesitter/nvim-treesitter.git
 
-      - name: Lint
+      - name: Format
         run: |
-          nvim --headless -c "TSInstallSync query" -c "q"
-          nvim -l scripts/format-queries.lua queries
+          make formatquery
           git diff --exit-code
+
+      - name: Lint
+        run: make lintquery
+

.github/workflows/lint.yml

@@ -0,0 +1,71 @@
+name: Tests
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    branches:
+      - "main"
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-build-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  check_compilation:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        nvim_tag: [nightly]
+    name: ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    env:
+      NVIM_TS_DIR: .test-deps/nvim-treesitter
+
+    steps:
+      - uses: actions/checkout@v4
+      - uses: tree-sitter/setup-action/cli@v1
+      - uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Install and prepare Neovim
+        env:
+          NVIM_TAG: ${{ matrix.nvim_tag }}
+        run: |
+          bash ./scripts/ci-install.sh
+
+      - name: Install nvim-treesitter
+        uses: actions/checkout@v4
+        with:
+          repository: nvim-treesitter/nvim-treesitter
+          ref: main
+          path: ${{ env.NVIM_TS_DIR }}
+
+      - name: Setup Parsers Cache
+        id: parsers-cache
+        uses: actions/cache@v4
+        with:
+          path: ~/.local/share/nvim/site/parser/
+          key: parsers-${{ hashFiles('parsers.lua') }}
+
+      - name: Compile parsers
+        if: steps.parsers-cache.outputs.cache-hit != 'true'
+        working-directory: ${{ env.NVIM_TS_DIR }}
+        run: nvim -l ./scripts/install-parsers.lua --max-jobs=10
+
+      - name: Lint docs
+        run: |
+          make docs
+          git diff --exit-code
+
+      - name: Check queries
+        run: make checkquery
+
+      - name: Run tests
+        run: make tests

.github/workflows/test.yml

@@ -1,3 +1,8 @@
+.test-deps
 doc/tags
 .luacheckcache
 /tags
+nvim.appimage
+nvim-linux-x86_64*
+nvim-macos*
+nvim-win64*

.github/workflows/tests.yml

@@ -0,0 +1,29 @@
+{
+  "$schema": "https://raw.githubusercontent.com/LuaLS/vscode-lua/master/setting/schema.json",
+  "runtime": {
+    "version": "LuaJIT"
+  },
+  "workspace": {
+    "library": [
+      "$VIMRUNTIME",
+      "${3rd}/busted/library"
+    ],
+    "ignoreDir": [
+      ".test-deps",
+      "scripts",
+      "tests"
+    ],
+    "checkThirdParty": "Disable"
+  },
+  "diagnostics": {
+    "groupFileStatus": {
+      "strict": "Opened",
+      "strong": "Opened"
+    },
+    "groupSeverity": {
+      "strong": "Warning",
+      "strict": "Warning"
+    },
+    "unusedLocalExclude": [ "_*" ]
+  }
+}

.github/workflows/update-readme.yml

@@ -1,3 +1,6 @@
+column_width = 100
+line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2
-no_call_parentheses = true
+quote_style = "AutoPreferSingle"
+call_parentheses = "Always"