diff options
| author | Yuan Fu | 2024-07-27 14:50:19 -0700 |
|---|---|---|
| committer | Yuan Fu | 2024-07-30 17:09:58 -0700 |
| commit | 74bb1e5897f4532fbdefddada28258a8d3d5c95f (patch) | |
| tree | af8687678575aa6457660ca861cc8ad923fe58ba /test | |
| parent | e4cd26defc0e1a6deafbe4b2310ebdb3ffa4578f (diff) | |
| download | emacs-74bb1e5897f4532fbdefddada28258a8d3d5c95f.tar.gz emacs-74bb1e5897f4532fbdefddada28258a8d3d5c95f.zip | |
Fix filling in c-ts-mode (bug#72116)
The previous fix introduced a regression in the case when there's only a
single line in the block comment. In that case we don't want to add a
start at the second line:
/* foo foo foo */ should => /* foo foo
foo */
rather than /* foo foo
* foo */
This commit fixes that.
* lisp/progmodes/c-ts-common.el:
(c-ts-common--fill-block-comment): Don't mask the /*.
(c-ts-common--adaptive-fill-prefix): New function.
(c-ts-common-comment-setup): Don't set adaptive-regexp, change
adaptive-fill-first-line-regexp to work with the new
adaptive-fill-function.
* test/lisp/progmodes/c-ts-mode-resources/filling.erts: New tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/progmodes/c-ts-mode-resources/filling.erts | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/test/lisp/progmodes/c-ts-mode-resources/filling.erts b/test/lisp/progmodes/c-ts-mode-resources/filling.erts index e51e3658c83..e58b8e91c90 100644 --- a/test/lisp/progmodes/c-ts-mode-resources/filling.erts +++ b/test/lisp/progmodes/c-ts-mode-resources/filling.erts | |||
| @@ -6,6 +6,52 @@ Code: | |||
| 6 | 6 | ||
| 7 | Point-Char: | | 7 | Point-Char: | |
| 8 | 8 | ||
| 9 | Name: Single line | ||
| 10 | |||
| 11 | =-= | ||
| 12 | /* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy */ | ||
| 13 | =-= | ||
| 14 | /* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy | ||
| 15 | woooomy */ | ||
| 16 | =-=-= | ||
| 17 | |||
| 18 | Name: Two lines | ||
| 19 | |||
| 20 | =-= | ||
| 21 | /* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy | ||
| 22 | woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy */ | ||
| 23 | =-= | ||
| 24 | /* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy | ||
| 25 | woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy | ||
| 26 | woooomy */ | ||
| 27 | =-=-= | ||
| 28 | |||
| 29 | Name: Two lines with star | ||
| 30 | |||
| 31 | =-= | ||
| 32 | /* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy | ||
| 33 | * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy | ||
| 34 | */ | ||
| 35 | =-= | ||
| 36 | /* woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy | ||
| 37 | * woooomy woooomy woooomy woooomy woooomy woooomy woooomy woooomy | ||
| 38 | * woooomy | ||
| 39 | */ | ||
| 40 | =-=-= | ||
| 41 | |||
| 42 | Name: First line empty (bug#72116) | ||
| 43 | |||
| 44 | =-= | ||
| 45 | /** | ||
| 46 | * rsite nrsoti ernsto ierntires ntoritsen roitsenrsoit enrstoi ensrotie nrsit ensroit enrsoi ensrien | ||
| 47 | */ | ||
| 48 | =-= | ||
| 49 | /** | ||
| 50 | * rsite nrsoti ernsto ierntires ntoritsen roitsenrsoit enrstoi | ||
| 51 | * ensrotie nrsit ensroit enrsoi ensrien | ||
| 52 | */ | ||
| 53 | =-=-= | ||
| 54 | |||
| 9 | Name: Type 1 | 55 | Name: Type 1 |
| 10 | 56 | ||
| 11 | =-= | 57 | =-= |