branch: elpa/swift-mode
commit 609471e9e242261de1d80231c58a469df7530be3
Author: taku0 <mxxouy6x3m_git...@tatapa.org>
Commit: taku0 <mxxouy6x3m_git...@tatapa.org>
Update for Emacs 29
- Update CI
- Update indentations
---
.github/workflows/run-test.yml | 17 ++++++++++++++++-
scripts/lint_in_docker.sh | 3 ++-
scripts/test_in_docker.sh | 4 ++--
swift-mode-beginning-of-defun.el | 12 ++++++------
swift-mode-indent.el | 2 +-
swift-mode-repl.el | 12 ++++++------
swift-mode.el | 4 ++--
7 files changed, 35 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml
index 7cf5b5c5e6..b9f15bc781 100644
--- a/.github/workflows/run-test.yml
+++ b/.github/workflows/run-test.yml
@@ -16,7 +16,20 @@ jobs:
# '25.1' fails for some reason even though `make lint_in_docker`
succeeds.
# swift-mode-beginning-of-defun.el:1081: All variables and subroutines
might as well have a documentation string
# swift-mode-beginning-of-defun.el:1135: All variables and subroutines
might as well have a documentation string
- version: ['24.4', '24.5', '25.2', '25.3', '26.1', '26.2', '26.3',
'27.1', '27.2', '28.1', 'snapshot']
+ version:
+ - '29.1'
+ - '28.2'
+ - '28.1'
+ - '27.2'
+ - '27.1'
+ - '26.3'
+ - '26.2'
+ - '26.1'
+ - '25.3'
+ - '25.2'
+ - '24.5'
+ - '24.4'
+ - 'snapshot'
env:
ELDEV_DIR: .eldev
@@ -33,6 +46,8 @@ jobs:
curl -fsSL https://raw.github.com/doublep/eldev/master/bin/eldev >
$ELDEV_DIR/bin/eldev
chmod a+x $ELDEV_DIR/bin/eldev
- name: Run linters
+ # Indentation rules changed since 29.
+ if: ${{ startsWith(matrix.version, '29.') }}
run: find ./*.el test/*.el '!' -name '*autoloads.el' -exec ${ELDEV} lint
'{}' '+'
- name: Run tests
run: ./scripts/run_test.sh
diff --git a/scripts/lint_in_docker.sh b/scripts/lint_in_docker.sh
index c5aeab96bf..e80e6523b2 100755
--- a/scripts/lint_in_docker.sh
+++ b/scripts/lint_in_docker.sh
@@ -2,7 +2,8 @@
# Run linter in Docker. Used in Makefile.
-for version in 28 27 26 25 24
+# Indentation rules changed since 29.
+for version in 29 # 28 27 26 25 24
do
docker \
run \
diff --git a/scripts/test_in_docker.sh b/scripts/test_in_docker.sh
index 4bd2155379..fd3b927de4 100755
--- a/scripts/test_in_docker.sh
+++ b/scripts/test_in_docker.sh
@@ -2,7 +2,7 @@
# Run tests in Docker. Used in Makefile.
-for version in 28 27 26 25 24
+for version in 29 28 27 26 25 24
do
rm -f *.elc test/*.elc
rm -f *-autoloads.el
@@ -14,7 +14,7 @@ do
--workdir="/src" \
--env=ELDEV_DIR=/src/.eldev \
--env=HOME=/tmp \
- silex/emacs:${version} \
+ silex/emacs:${version}-ci \
bash -c "/src/scripts/run_test.sh" \
|| exit 1
done
diff --git a/swift-mode-beginning-of-defun.el b/swift-mode-beginning-of-defun.el
index 11fb3e2a3f..399d4f24e9 100644
--- a/swift-mode-beginning-of-defun.el
+++ b/swift-mode-beginning-of-defun.el
@@ -167,12 +167,12 @@ Otherwise, return nil.
The cursor must be at the beginning of a statement."
(let ((token (swift-mode:forward-token-or-list))
(defun-keywords
- '("import" "typealias" "associatedtype"
- "enum" "struct" "actor" "protocol" "extension"
- "func" "init" "deinit" "subscript" "get" "set" "willSet" "didSet"
- "prefix" "postfix" "infix" "precedencegroup"
- "var" "let"
- "case"))
+ '("import" "typealias" "associatedtype"
+ "enum" "struct" "actor" "protocol" "extension"
+ "func" "init" "deinit" "subscript" "get" "set" "willSet" "didSet"
+ "prefix" "postfix" "infix" "precedencegroup"
+ "var" "let"
+ "case"))
(stop-tokens '(\; implicit-\; {} { } \( \) \[ \]
anonymous-function-parameter-in outside-of-buffer))
(class-token nil))
diff --git a/swift-mode-indent.el b/swift-mode-indent.el
index 9dc259d322..1db26a69aa 100644
--- a/swift-mode-indent.el
+++ b/swift-mode-indent.el
@@ -1485,7 +1485,7 @@ When this function returns, the cursor is at the start of
the token.
If there is no open curly braces, return `outside-of-buffer' token.
-This is optimized version of (swift-mode:backward-sexps-until '({}))."
+This is optimized version of (swift-mode:backward-sexps-until \\='({}))."
(let* ((parent-position (nth 1 (syntax-ppss))))
(while (and parent-position
(and (goto-char parent-position)
diff --git a/swift-mode-repl.el b/swift-mode-repl.el
index cb94b5c969..fb59655e08 100644
--- a/swift-mode-repl.el
+++ b/swift-mode-repl.el
@@ -571,9 +571,9 @@ SCHEME is the name of the project scheme in Xcode. If it
is nil or omitted,
the value of `swift-mode:ios-project-scheme' is used."
(interactive
(let* ((default-project-directory
- (or
- (swift-mode:find-xcode-workspace-directory)
- (swift-mode:find-xcode-project-directory)))
+ (or
+ (swift-mode:find-xcode-workspace-directory)
+ (swift-mode:find-xcode-project-directory)))
(project-directory
(if current-prefix-arg
(swift-mode:read-project-directory default-project-directory)
@@ -902,9 +902,9 @@ SCHEME is the name of the project scheme in Xcode. If it
is nil or omitted,
the value of `swift-mode:ios-project-scheme' is used."
(interactive
(let* ((default-project-directory
- (or
- (swift-mode:find-xcode-workspace-directory)
- (swift-mode:find-xcode-project-directory)))
+ (or
+ (swift-mode:find-xcode-workspace-directory)
+ (swift-mode:find-xcode-project-directory)))
(project-directory
(if current-prefix-arg
(swift-mode:read-project-directory default-project-directory)
diff --git a/swift-mode.el b/swift-mode.el
index 5b6fd1bcc8..32406c4b32 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -66,7 +66,7 @@
(let ((map (make-sparse-keymap)))
(set-keymap-parent map prog-mode-map)
(define-key map [remap indent-new-comment-line]
- #'swift-mode:indent-new-comment-line)
+ #'swift-mode:indent-new-comment-line)
(define-key map (kbd "C-c C-z") #'swift-mode:run-repl)
(define-key map (kbd "C-c C-f") #'swift-mode:send-buffer)
(define-key map (kbd "C-c C-r") #'swift-mode:send-region)
@@ -78,7 +78,7 @@
(define-key map [remap forward-sentence] #'swift-mode:forward-sentence)
(define-key map [remap kill-sentence] #'swift-mode:kill-sentence)
(define-key map [remap backward-kill-sentence]
- #'swift-mode:backward-kill-sentence)
+ #'swift-mode:backward-kill-sentence)
;; (define-key map (kbd "???") #'swift-mode:mark-sentence)
(define-key map [remap narrow-to-sentence] #'swift-mode:narrow-to-sentence)
