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

6 files changed, 86 insertions, 5 deletions

diff --git a/.github/scripts/build_universal_macos.sh b/.github/scripts/build_universal_macos.sh
index d07c395cd6..aeda93ee03 100755
--- a/.github/scripts/build_universal_macos.sh
+++ b/.github/scripts/build_universal_macos.sh
@@ -1,17 +1,18 @@
 #!/bin/bash -e
 
-MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion | cut -f1 -d.)"
+MACOSX_DEPLOYMENT_TARGET=11.0
 export MACOSX_DEPLOYMENT_TARGET
 cmake -S cmake.deps -B .deps -G Ninja \
-  -D CMAKE_BUILD_TYPE=${NVIM_BUILD_TYPE} \
+  -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=${NVIM_BUILD_TYPE} \
+  -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
diff --git a/.github/scripts/close_unresponsive.js b/.github/scripts/close_unresponsive.js
index f0e8bbe93e..b16c19b653 100644
--- a/.github/scripts/close_unresponsive.js
+++ b/.github/scripts/close_unresponsive.js
@@ -41,6 +41,7 @@ module.exports = async ({ github, context }) => {
         owner: owner,
         repo: repo,
         issue_number: number,
+        state_reason: "not_planned",
         state: "closed",
       });
 
diff --git a/.github/scripts/install_deps.sh b/.github/scripts/install_deps.sh
index 9a782e9698..ad81e053f9 100755
--- a/.github/scripts/install_deps.sh
+++ b/.github/scripts/install_deps.sh
@@ -30,12 +30,12 @@ if [[ $os == Linux ]]; then
   fi
 
   if [[ -n $TEST ]]; then
-    sudo apt-get install -y locales-all cpanminus attr libattr1-dev gdb
+    sudo apt-get install -y locales-all cpanminus attr libattr1-dev gdb fswatch
   fi
 elif [[ $os == Darwin ]]; then
   brew update --quiet
   brew install ninja
   if [[ -n $TEST ]]; then
-    brew install cpanminus
+    brew install cpanminus fswatch
   fi
 fi
diff --git a/.github/scripts/labeler_configuration.yml b/.github/scripts/labeler_configuration.yml
new file mode 100644
index 0000000000..3db8444fde
--- /dev/null
+++ b/.github/scripts/labeler_configuration.yml
@@ -0,0 +1,71 @@
+lsp:
+  - changed-files:
+    - any-glob-to-any-file: [ runtime/lua/vim/lsp.lua, runtime/lua/vim/lsp/* ]
+
+tui:
+  - changed-files:
+    - any-glob-to-any-file: [ src/nvim/tui/tui.* ]
+
+treesitter:
+  - changed-files:
+    - any-glob-to-any-file: [ src/nvim/lua/treesitter.*, runtime/lua/vim/treesitter.lua, runtime/lua/vim/treesitter/*, runtime/queries/**/* ]
+
+diagnostic:
+  - changed-files:
+    - any-glob-to-any-file: [ runtime/lua/vim/diagnostic.lua ]
+
+dependencies:
+  - changed-files:
+    - any-glob-to-any-file: [ cmake.deps/**/* ]
+
+spell:
+  - changed-files:
+    - any-glob-to-any-file: [ src/nvim/spell* ]
+
+terminal:
+  - changed-files:
+    - any-glob-to-any-file: [ src/nvim/terminal.* ]
+
+column:
+  - changed-files:
+    - any-glob-to-any-file: [ src/nvim/sign* ]
+
+folds:
+  - changed-files:
+    - any-glob-to-any-file: [ src/nvim/fold* ]
+
+mouse:
+  - changed-files:
+    - any-glob-to-any-file: [ src/nvim/mouse* ]
+
+documentation:
+  - changed-files:
+    - any-glob-to-all-files: [ runtime/doc/*, "**/*.md" ]
+
+clipboard:
+  - changed-files:
+    - any-glob-to-any-file: [ runtime/autoload/provider/clipboard.vim ]
+
+diff:
+  - changed-files:
+    - any-glob-to-any-file: [ src/nvim/diff.* ]
+
+build:
+  - changed-files:
+    - any-glob-to-any-file: [ CMakeLists.txt, "**/CMakeLists.txt", "**/Makefile", "**/*.cmake" ]
+
+test:
+  - changed-files:
+    - any-glob-to-all-files: [test/**/*]
+
+ci:
+  - changed-files:
+    - any-glob-to-any-file: [ .github/actions/**, .github/workflows/**, .github/scripts/** ]
+
+filetype:
+  - changed-files:
+    - any-glob-to-any-file: [ runtime/lua/vim/filetype.lua, runtime/lua/vim/filetype/detect.lua ]
+
+platform:nix:
+  - changed-files:
+    - any-glob-to-any-file: [ contrib/flake.lock, contrib/flake.nix ]
diff --git a/.github/scripts/reviews.js b/.github/scripts/reviewers_add.js
index d28d91c2f6..c6a878ec8e 100644
--- a/.github/scripts/reviews.js
+++ b/.github/scripts/reviewers_add.js
@@ -28,6 +28,10 @@ module.exports = async ({ github, context }) => {
     reviewers.add("lewis6991");
   }
 
+  if (labels.includes("defaults")) {
+    reviewers.add("gpanders");
+  }
+
   if (labels.includes("dependencies")) {
     reviewers.add("jamessan");
   }
@@ -91,6 +95,10 @@ module.exports = async ({ github, context }) => {
     reviewers.add("lewis6991");
   }
 
+  if (labels.includes("tui")) {
+    reviewers.add("gpanders");
+  }
+
   if (labels.includes("typo")) {
     reviewers.add("dundargoc");
   }
diff --git a/.github/scripts/remove-reviewers.js b/.github/scripts/reviewers_remove.js
index 9e44e4ac86..9e44e4ac86 100644
--- a/.github/scripts/remove-reviewers.js
+++ b/.github/scripts/reviewers_remove.js