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

5 files changed, 49 insertions, 76 deletions

diff --git a/.github/scripts/build_universal_macos.sh b/.github/scripts/build_universal_macos.sh
deleted file mode 100755
index aeda93ee03..0000000000
--- a/.github/scripts/build_universal_macos.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash -e
-
-MACOSX_DEPLOYMENT_TARGET=11.0
-export MACOSX_DEPLOYMENT_TARGET
-cmake -S cmake.deps -B .deps -G Ninja \
-  -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-  -D CMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} \
-  -D CMAKE_OSX_ARCHITECTURES=arm64\;x86_64 \
-  -D CMAKE_FIND_FRAMEWORK=NEVER
-cmake --build .deps
-cmake -B build -G Ninja \
-  -D CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} \
-  -D CMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} \
-  -D CMAKE_OSX_ARCHITECTURES=arm64\;x86_64 \
-  -D ENABLE_LIBINTL=OFF \
-  -D CMAKE_FIND_FRAMEWORK=NEVER
-cmake --build build
-# Make sure we build everything for M1 as well
-for macho in build/bin/* build/lib/nvim/parser/*.so; do
-  lipo -info "$macho" | grep -q arm64 || exit 1
-done
-cpack --config build/CPackConfig.cmake
diff --git a/.github/scripts/close_unresponsive.js b/.github/scripts/close_unresponsive.js
index b16c19b653..5fd231423c 100644
--- a/.github/scripts/close_unresponsive.js
+++ b/.github/scripts/close_unresponsive.js
@@ -26,7 +26,7 @@ module.exports = async ({ github, context }) => {
         repo: repo,
         issue_number: number,
       },
-      (response) => response.data.filter(labeledEvent)
+      (response) => response.data.filter(labeledEvent),
     );
 
     const latest_response_label = events[events.length - 1];
diff --git a/.github/scripts/install_deps.sh b/.github/scripts/install_deps.sh
index ad81e053f9..66f418eb10 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=17
+    CLANG_VERSION=18
     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
@@ -31,11 +31,17 @@ if [[ $os == Linux ]]; then
 
   if [[ -n $TEST ]]; then
     sudo apt-get install -y locales-all cpanminus attr libattr1-dev gdb fswatch
+
+    # Use default CC to avoid compilation problems when installing Python modules
+    CC=cc python3 -m pip -q install --user --upgrade pynvim
   fi
 elif [[ $os == Darwin ]]; then
   brew update --quiet
   brew install ninja
   if [[ -n $TEST ]]; then
     brew install cpanminus fswatch
+
+    # Use default CC to avoid compilation problems when installing Python modules
+    CC=cc python3 -m pip -q install --user --upgrade --break-system-packages pynvim
   fi
 fi
diff --git a/.github/scripts/labeler_configuration.yml b/.github/scripts/labeler_configuration.yml
index 3db8444fde..ea670d1dd0 100644
--- a/.github/scripts/labeler_configuration.yml
+++ b/.github/scripts/labeler_configuration.yml
@@ -1,71 +1,71 @@
-lsp:
+build:
   - changed-files:
-    - any-glob-to-any-file: [ runtime/lua/vim/lsp.lua, runtime/lua/vim/lsp/* ]
+    - any-glob-to-any-file: [ CMakeLists.txt, "**/CMakeLists.txt", "**/Makefile", "**/*.cmake", cmake.deps/**/* ]
 
-tui:
+ci:
   - changed-files:
-    - any-glob-to-any-file: [ src/nvim/tui/tui.* ]
+    - any-glob-to-any-file: [ .github/actions/**, .github/workflows/**, .github/scripts/** ]
 
-treesitter:
+clipboard:
   - changed-files:
-    - any-glob-to-any-file: [ src/nvim/lua/treesitter.*, runtime/lua/vim/treesitter.lua, runtime/lua/vim/treesitter/*, runtime/queries/**/* ]
+    - any-glob-to-any-file: [ runtime/autoload/provider/clipboard.vim ]
+
+column:
+  - changed-files:
+    - any-glob-to-any-file: [ src/nvim/sign* ]
 
 diagnostic:
   - changed-files:
     - any-glob-to-any-file: [ runtime/lua/vim/diagnostic.lua ]
 
-dependencies:
+diff:
   - changed-files:
-    - any-glob-to-any-file: [ cmake.deps/**/* ]
+    - any-glob-to-any-file: [ src/nvim/diff.* ]
 
-spell:
+documentation:
   - changed-files:
-    - any-glob-to-any-file: [ src/nvim/spell* ]
+    - any-glob-to-all-files: [ runtime/doc/*, "**/*.md" ]
 
-terminal:
+editorconfig:
   - changed-files:
-    - any-glob-to-any-file: [ src/nvim/terminal.* ]
+    - any-glob-to-any-file: [ .editorconfig, runtime/lua/editorconfig.lua, runtime/plugin/editorconfig.lua ]
 
-column:
+filetype:
   - changed-files:
-    - any-glob-to-any-file: [ src/nvim/sign* ]
+    - any-glob-to-any-file: [ runtime/lua/vim/filetype.lua, runtime/lua/vim/filetype/detect.lua ]
 
 folds:
   - changed-files:
     - any-glob-to-any-file: [ src/nvim/fold* ]
 
-mouse:
+lsp:
   - changed-files:
-    - any-glob-to-any-file: [ src/nvim/mouse* ]
+    - any-glob-to-any-file: [ runtime/lua/vim/lsp.lua, runtime/lua/vim/lsp/* ]
 
-documentation:
+mouse:
   - changed-files:
-    - any-glob-to-all-files: [ runtime/doc/*, "**/*.md" ]
+    - any-glob-to-any-file: [ src/nvim/mouse* ]
 
-clipboard:
+snippet:
   - changed-files:
-    - any-glob-to-any-file: [ runtime/autoload/provider/clipboard.vim ]
+    - any-glob-to-any-file: [ runtime/lua/vim/snippet.lua ]
 
-diff:
+spell:
   - changed-files:
-    - any-glob-to-any-file: [ src/nvim/diff.* ]
+    - any-glob-to-any-file: [ src/nvim/spell* ]
 
-build:
+terminal:
   - changed-files:
-    - any-glob-to-any-file: [ CMakeLists.txt, "**/CMakeLists.txt", "**/Makefile", "**/*.cmake" ]
+    - any-glob-to-any-file: [ src/nvim/terminal.* ]
 
 test:
   - changed-files:
     - any-glob-to-all-files: [test/**/*]
 
-ci:
-  - changed-files:
-    - any-glob-to-any-file: [ .github/actions/**, .github/workflows/**, .github/scripts/** ]
-
-filetype:
+treesitter:
   - changed-files:
-    - any-glob-to-any-file: [ runtime/lua/vim/filetype.lua, runtime/lua/vim/filetype/detect.lua ]
+    - any-glob-to-any-file: [ src/nvim/lua/treesitter.*, runtime/lua/vim/treesitter.lua, runtime/lua/vim/treesitter/*, runtime/queries/**/* ]
 
-platform:nix:
+tui:
   - changed-files:
-    - any-glob-to-any-file: [ contrib/flake.lock, contrib/flake.nix ]
+    - any-glob-to-any-file: [ src/nvim/tui/tui.* ]
diff --git a/.github/scripts/reviewers_add.js b/.github/scripts/reviewers_add.js
index c6a878ec8e..a7e0d2e47b 100644
--- a/.github/scripts/reviewers_add.js
+++ b/.github/scripts/reviewers_add.js
@@ -7,11 +7,6 @@ module.exports = async ({ github, context }) => {
   const labels = pr_data.data.labels.map((e) => e.name);
   const reviewers = new Set();
 
-  if (labels.includes("api")) {
-    reviewers.add("bfredl");
-    reviewers.add("famiu");
-  }
-
   if (labels.includes("build")) {
     reviewers.add("dundargoc");
     reviewers.add("jamessan");
@@ -32,10 +27,6 @@ module.exports = async ({ github, context }) => {
     reviewers.add("gpanders");
   }
 
-  if (labels.includes("dependencies")) {
-    reviewers.add("jamessan");
-  }
-
   if (labels.includes("diagnostic")) {
     reviewers.add("gpanders");
   }
@@ -44,14 +35,14 @@ module.exports = async ({ github, context }) => {
     reviewers.add("lewis6991");
   }
 
-  if (labels.includes("distribution")) {
-    reviewers.add("jamessan");
-  }
-
   if (labels.includes("documentation")) {
     reviewers.add("clason");
   }
 
+  if (labels.includes("editorconfig")) {
+    reviewers.add("gpanders");
+  }
+
   if (labels.includes("extmarks")) {
     reviewers.add("bfredl");
   }
@@ -59,11 +50,9 @@ module.exports = async ({ github, context }) => {
   if (labels.includes("filetype")) {
     reviewers.add("clason");
     reviewers.add("gpanders");
-    reviewers.add("smjonas");
   }
 
   if (labels.includes("lsp")) {
-    reviewers.add("folke");
     reviewers.add("MariaSolOs");
     reviewers.add("mfussenegger");
   }
@@ -81,6 +70,10 @@ module.exports = async ({ github, context }) => {
     reviewers.add("justinmk");
   }
 
+  if (labels.includes("snippet")) {
+    reviewers.add("MariaSolOs");
+  }
+
   if (labels.includes("statusline")) {
     reviewers.add("famiu");
   }
@@ -93,6 +86,7 @@ module.exports = async ({ github, context }) => {
     reviewers.add("bfredl");
     reviewers.add("clason");
     reviewers.add("lewis6991");
+    reviewers.add("wookayin");
   }
 
   if (labels.includes("tui")) {
@@ -103,11 +97,6 @@ module.exports = async ({ github, context }) => {
     reviewers.add("dundargoc");
   }
 
-  if (labels.includes("ui")) {
-    reviewers.add("bfredl");
-    reviewers.add("famiu");
-  }
-
   if (labels.includes("vim-patch")) {
     reviewers.add("seandewar");
     reviewers.add("zeertzjq");