diff options
| author | Eli Zaretskii | 2024-02-24 06:35:16 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2024-02-24 06:35:16 -0500 |
| commit | 229b3edb072de490f458cf986bf34bc1ffc87837 (patch) | |
| tree | d148b6d64bbda32d2929f24b2f96b390f61a0248 /test | |
| parent | eeb89a5cb292bffe40ba7d0b0cf81f82f8452bf8 (diff) | |
| parent | 01ebc95114fe89ef623bc7ebdd3c3e1b9ef06b4e (diff) | |
| download | emacs-229b3edb072de490f458cf986bf34bc1ffc87837.tar.gz emacs-229b3edb072de490f458cf986bf34bc1ffc87837.zip | |
Merge from origin/emacs-29
01ebc95114f Fix 'help-quick-toggle'
afe49c7e2a2 ; * admin/authors.el (authors-aliases): Fix last change.
8b1f10f8cf4 ; Normalize Morgan Smith's attributions.
70cf4b694b3 ; * etc/PROBLEMS: Describe input lags due to GTK IM (bug#...
f28a557c7d4 * doc/lispref/modes.texi (Tabulated List Mode): Update.
d6131b5902a * lisp/net/tramp.el (tramp-methods): Fix typo in docstrin...
2eb85a9de1a ; * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Ano...
4c6653f23ae ; * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Doc...
5a64d2c7595 java-ts-mode: Indentation for opening brace on a separate...
9e56bd5ed87 Removed decommissioned PGP keyservers
e56f0ef51bf org: Fix security prompt for downloading remote resource
65ba3274652 Revert "Update to Org 9.6.19"
07a392f445e Update to Org 9.6.19
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/progmodes/java-ts-mode-resources/indent.erts | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/test/lisp/progmodes/java-ts-mode-resources/indent.erts b/test/lisp/progmodes/java-ts-mode-resources/indent.erts index 4fca74dd2e1..514d2e08977 100644 --- a/test/lisp/progmodes/java-ts-mode-resources/indent.erts +++ b/test/lisp/progmodes/java-ts-mode-resources/indent.erts | |||
| @@ -110,3 +110,34 @@ public class Java { | |||
| 110 | } | 110 | } |
| 111 | } | 111 | } |
| 112 | =-=-= | 112 | =-=-= |
| 113 | |||
| 114 | Name: Opening bracket on separate line (bug#67556) | ||
| 115 | |||
| 116 | =-= | ||
| 117 | public class Java { | ||
| 118 | void foo( | ||
| 119 | String foo) | ||
| 120 | { | ||
| 121 | for (var f : rs) | ||
| 122 | return new String[] | ||
| 123 | { | ||
| 124 | "foo", | ||
| 125 | "bar" | ||
| 126 | }; | ||
| 127 | if (a == 0) | ||
| 128 | { | ||
| 129 | return 0; | ||
| 130 | } else if (a == 1) | ||
| 131 | { | ||
| 132 | return 1; | ||
| 133 | } | ||
| 134 | |||
| 135 | switch(expr) | ||
| 136 | { | ||
| 137 | case x: | ||
| 138 | // code block | ||
| 139 | break; | ||
| 140 | } | ||
| 141 | } | ||
| 142 | } | ||
| 143 | =-=-= | ||