10000 Update for Emacs 29 · swift-emacs/swift-mode@609471e · GitHub
[go: up one dir, main page]
Skip to content

Commit 609471e

Browse files
taku0taku0
committed
Update for Emacs 29
- Update CI - Update indentations
1 parent 4c2231e commit 609471e

File tree

7 files changed

+35
-19
lines changed

7 files changed

+35
-19
lines changed

‎.github/workflows/run-test.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,20 @@ jobs:
1616
# '25.1' fails for some reason even though `make lint_in_docker` succeeds.
1717
# swift-mode-beginning-of-defun.el:1081: All variables and subroutines might as well have a documentation string
1818
# swift-mode-beginning-of-defun.el:1135: All variables and subroutines might as well have a documentation string
19-
version: ['24.4', '24.5', '25.2', '25.3', '26.1', '26.2', '26.3', '27.1', '27.2', '28.1', 'snapshot']
19+
version:
20+
- '29.1'
21+
- '28.2'
22+
- '28.1'
23+
- '27.2'
24+
- '27.1'
25+
- '26.3'
26+
- '26.2'
27+
- '26.1'
28+
- '25.3'
29+
- '25.2'
30+
- '24.5'
31+
- '24.4'
32+
- 'snapshot'
2033

2134
env:
2235
ELDEV_DIR: .eldev
@@ -33,6 +46,8 @@ jobs:
3346
curl -fsSL https://raw.github.com/doublep/eldev/master/bin/eldev > $ELDEV_DIR/bin/eldev
3447
chmod a+x $ELDEV_DIR/bin/eldev
3548
- name: Run linters
49+
# Indentation rules changed since 29.
50+
if: ${{ startsWith(matrix.version, '29.') }}
3651
run: find ./*.el test/*.el '!' -name '*autoloads.el' -exec ${ELDEV} lint '{}' '+'
3752
- name: Run tests
3853
run: ./scripts/run_test.sh

‎scripts/lint_in_docker.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
# Run linter in Docker. Used in Makefile.
44

5-
for version in 28 27 26 25 24
5+
# Indentation rules changed since 29.
6+
for version in 29 # 28 27 26 25 24
67
do
78
docker \
89
run \

‎scripts/test_in_docker.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Run tests in Docker. Used in Makefile.
44

5-
for version in 28 27 26 25 24
5+
for version in 29 28 27 26 25 24
66
do
77
rm -f *.elc test/*.elc
88
rm -f *-autoloads.el
@@ -14,7 +14,7 @@ do
1414
--workdir="/src" \
1515
--env=ELDEV_DIR=/src/.eldev \
1616
--env=HOME=/tmp \
17-
silex/emacs:${version} \
17+
silex/emacs:${version}-ci \
1818
bash -c "/src/scripts/run_test.sh" \
1919
|| exit 1
2020
done

‎swift-mode-beginning-of-defun.el

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -167,12 +167,12 @@ Otherwise, return nil.
167167
The cursor must be at the beginning of a statement."
168168
(let ((token (swift-mode:forward-token-or-list))
169169
(defun-keywords
170-
'("import" "typealias" "associatedtype"
171-
"enum" "struct" "actor" "protocol" "extension"
172-
"func" "init" "deinit" "subscript" "get" "set" "willSet" "didSet"
173-
"prefix" "postfix" "infix" "precedencegroup"
174-
"var" "let"
175-
"case"))
170+
'("import" "typealias" "associatedtype"
171+
"enum" "struct" "actor" "protocol" "extension"
172+
"func" "init" "deinit" "subscript" "get" "set" "willSet" "didSet"
173+
"prefix" "postfix" "infix" "precedencegroup"
174+
"var" "let"
175+
"case"))
176176
(stop-tokens '(\; implicit-\; {} { } \( \) \[ \]
177177
anonymous-function-parameter-in outside-of-buffer))
178178
(class-token nil))

‎swift-mode-indent.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1485,7 +1485,7 @@ When this function returns, the cursor is at the start of the token.
14851485
14861486
If there is no open curly braces, return `outside-of-buffer' token.
14871487
1488-
This is optimized version of (swift-mode:backward-sexps-until '({}))."
1488+
This is optimized version of (swift-mode:backward-sexps-until \\='({}))."
14891489
(let* ((parent-position (nth 1 (syntax-ppss))))
14901490
(while (and parent-position
14911491
(and (goto-char parent-position)

‎swift-mode-repl.el

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -571,9 +571,9 @@ SCHEME is the name of the project scheme in Xcode. If it is nil or omitted,
571571
the value of `swift-mode:ios-project-scheme' is used."
572572
(interactive
573573
(let* ((default-project-directory
574-
(or
575-
(swift-mode:find-xcode-workspace-directory)
576-
(swift-mode:find-xcode-project-directory)))
574+
(or
575+
(swift-mode:find-xcode-workspace-directory)
576+
(swift-mode:find-xcode-project-directory)))
577577
(project-directory
578578
(if current-prefix-arg
579579
(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,
902902
the value of `swift-mode:ios-project-scheme' is used."
903903
(interactive
904904
(let* ((default-project-directory
905-
(or
906-
(swift-mode:find-xcode-workspace-directory)
907-
(swift-mode:find-xcode-project-directory)))
905+
(or
906+
(swift-mode:find-xcode-workspace-directory)
907+
(swift-mode:find-xcode-project-directory)))
908908
(project-directory
909909
(if current-prefix-arg
910910
(swift-mode:read-project-directory default-project-directory)

‎swift-mode.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
(let ((map (make-sparse-keymap)))
6767
(set-keymap-parent map prog-mode-map)
6868
(define-key map [remap indent-new-comment-line]
69-
#'swift-mode:indent-new-comment-line)
69+
#'swift-mode:indent-new-comment-line)
7070
(define-key map (kbd "C-c C-z") #'swift-mode:run-repl)
7171
(define-key map (kbd "C-c C-f") #'swift-mode:send-buffer)
7272
(define-key map (kbd "C-c C-r") #'swift-mode:send-region)
@@ -78,7 +78,7 @@
7878
(define-key map [remap forward-sentence] #'swift-mode:forward-sentence)
7979
(define-key map [remap kill-sentence] #'swift-mode:kill-sentence)
8080
(define-key map [remap backward-kill-sentence]
81-
#'swift-mode:backward-kill-sentence)
81+
#'swift-mode:backward-kill-sentence)
8282
;; (define-key map (kbd "???") #'swift-mode:mark-sentence)
8383
(define-key map [remap narrow-to-sentence] #'swift-mode:narrow-to-sentence)
8484

0 commit comments

Comments
 (0)
0