Merge remote-tracking branch 'upstream/master' into mix_20240309

3 files changed, 36 insertions, 4 deletions

diff --git a/.github/scripts/install_deps.sh b/.github/scripts/install_deps.sh
index 66f418eb10..b7d723e690 100755
--- a/.github/scripts/install_deps.sh
+++ b/.github/scripts/install_deps.sh
@@ -16,7 +16,7 @@ if [[ $os == Linux ]]; then
 
   if [[ $CC == clang ]]; then
     DEFAULT_CLANG_VERSION=$(echo |  clang -dM -E - | grep __clang_major | awk '{print $3}')
-    CLANG_VERSION=18
+    CLANG_VERSION=20
     if ((DEFAULT_CLANG_VERSION >= CLANG_VERSION)); then
       echo "Default clang version is $DEFAULT_CLANG_VERSION, which equal or larger than wanted version $CLANG_VERSION. Aborting!"
       exit 1
@@ -30,10 +30,10 @@ if [[ $os == Linux ]]; then
   fi
 
   if [[ -n $TEST ]]; then
-    sudo apt-get install -y locales-all cpanminus attr libattr1-dev gdb fswatch
+    sudo apt-get install -y locales-all cpanminus attr libattr1-dev gdb inotify-tools
 
     # Use default CC to avoid compilation problems when installing Python modules
-    CC=cc python3 -m pip -q install --user --upgrade pynvim
+    CC=cc python3 -m pip -q install --user --upgrade --break-system-packages pynvim
   fi
 elif [[ $os == Darwin ]]; then
   brew update --quiet
diff --git a/.github/scripts/labeler_configuration.yml b/.github/scripts/labeler_configuration.yml
index ea670d1dd0..cf3b8f802b 100644
--- a/.github/scripts/labeler_configuration.yml
+++ b/.github/scripts/labeler_configuration.yml
@@ -2,6 +2,10 @@ build:
   - changed-files:
     - any-glob-to-any-file: [ CMakeLists.txt, "**/CMakeLists.txt", "**/Makefile", "**/*.cmake", cmake.deps/**/* ]
 
+checkhealth:
+  - changed-files:
+    - any-glob-to-any-file: [ "**/health.lua" ]
+
 ci:
   - changed-files:
     - any-glob-to-any-file: [ .github/actions/**, .github/workflows/**, .github/scripts/** ]
@@ -14,6 +18,14 @@ column:
   - changed-files:
     - any-glob-to-any-file: [ src/nvim/sign* ]
 
+comment:
+  - changed-files:
+    - any-glob-to-any-file: [ runtime/lua/vim/_comment.lua ]
+
+defaults:
+  - changed-files:
+    - any-glob-to-any-file: [ runtime/lua/vim/_defaults.lua ]
+
 diagnostic:
   - changed-files:
     - any-glob-to-any-file: [ runtime/lua/vim/diagnostic.lua ]
@@ -34,6 +46,10 @@ filetype:
   - changed-files:
     - any-glob-to-any-file: [ runtime/lua/vim/filetype.lua, runtime/lua/vim/filetype/detect.lua ]
 
+filesystem:
+  - changed-files:
+    - any-glob-to-any-file: [ runtime/lua/vim/fs.lua ]
+
 folds:
   - changed-files:
     - any-glob-to-any-file: [ src/nvim/fold* ]
@@ -46,6 +62,10 @@ mouse:
   - changed-files:
     - any-glob-to-any-file: [ src/nvim/mouse* ]
 
+netrw:
+  - changed-files:
+    - any-glob-to-any-file: [ runtime/autoload/netrw.vim, runtime/plugin/netrwPlugin.vim ]
+
 snippet:
   - changed-files:
     - any-glob-to-any-file: [ runtime/lua/vim/snippet.lua ]
diff --git a/.github/scripts/reviewers_add.js b/.github/scripts/reviewers_add.js
index a7e0d2e47b..50195497af 100644
--- a/.github/scripts/reviewers_add.js
+++ b/.github/scripts/reviewers_add.js
@@ -23,6 +23,10 @@ module.exports = async ({ github, context }) => {
     reviewers.add("lewis6991");
   }
 
+  if (labels.includes("comment")) {
+    reviewers.add("echasnovski");
+  }
+
   if (labels.includes("defaults")) {
     reviewers.add("gpanders");
   }
@@ -43,7 +47,7 @@ module.exports = async ({ github, context }) => {
     reviewers.add("gpanders");
   }
 
-  if (labels.includes("extmarks")) {
+  if (labels.includes("marks")) {
     reviewers.add("bfredl");
   }
 
@@ -52,11 +56,19 @@ module.exports = async ({ github, context }) => {
     reviewers.add("gpanders");
   }
 
+  if (labels.includes("inccommand")) {
+    reviewers.add("famiu");
+  }
+
   if (labels.includes("lsp")) {
     reviewers.add("MariaSolOs");
     reviewers.add("mfussenegger");
   }
 
+  if (labels.includes("netrw")) {
+    reviewers.add("justinmk");
+  }
+
   if (labels.includes("options")) {
     reviewers.add("famiu");
   }