[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/csharp-mode ba7a81a 253/459: Advise c-inside-bracelist-
From: |
ELPA Syncer |
Subject: |
[elpa] externals/csharp-mode ba7a81a 253/459: Advise c-inside-bracelist-p (#122) |
Date: |
Sun, 22 Aug 2021 13:59:38 -0400 (EDT) |
branch: externals/csharp-mode
commit ba7a81a85ee5fd234f24333ab156ce897cb20cc7
Author: James Nguyen <james@jojojames.com>
Commit: Jostein Kjønigsen <jostein@kjonigsen.net>
Advise c-inside-bracelist-p (#122)
---
csharp-mode-tests.el | 7 +++++++
csharp-mode.el | 11 +++++++++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/csharp-mode-tests.el b/csharp-mode-tests.el
index 12becdd..38d485e 100644
--- a/csharp-mode-tests.el
+++ b/csharp-mode-tests.el
@@ -422,6 +422,13 @@
(should
(equal "C#" c-indentation-style)))))
+(ert-deftest inside-bracelist-test ()
+ (let ((c-default-style "defaultc#"))
+ (with-temp-buffer
+ (csharp-mode)
+ (insert "public class A { public void F() {")
+ (call-interactively #'newline))))
+
;;(ert-run-tests-interactively t)
;; (local-set-key (kbd "<f6>") '(lambda ()
;; (interactive)
diff --git a/csharp-mode.el b/csharp-mode.el
index 04c49ec..7fd4a50 100644
--- a/csharp-mode.el
+++ b/csharp-mode.el
@@ -2576,11 +2576,18 @@ are the string substitutions (see `format')."
res))))
+(advice-add 'c-inside-bracelist-p
+ :around 'csharp-inside-bracelist-or-c-inside-bracelist-p)
+(defun csharp-inside-bracelist-or-c-inside-bracelist-p (command &rest args)
+ "Run `csharp-inside-bracelist-p' if in `csharp-mode'.
+Otherwise run `c-inside-bracelist-p'."
+ (if (eq major-mode 'csharp-mode)
+ (csharp-inside-bracelist-p (nth 0 args) (nth 1 args))
+ (apply command args)))
-
-(defun c-inside-bracelist-p (containing-sexp paren-state)
+(defun csharp-inside-bracelist-p (containing-sexp paren-state)
;; return the buffer position of the beginning of the brace list
;; statement if we're inside a brace list, otherwise return nil.
;; CONTAINING-SEXP is the buffer pos of the innermost containing
- [elpa] externals/csharp-mode ed7c30c 224/459: WIP: Fix checkdoc- and package-lint errors, (continued)
- [elpa] externals/csharp-mode ed7c30c 224/459: WIP: Fix checkdoc- and package-lint errors, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode bbd2888 232/459: Merge branch 'mattiasb-fix-warnings', ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode bc6a419 237/459: Update changelog., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 8ab3cc8 239/459: Dirty hack to force type-initializer indentation., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode d39d9ac 241/459: Revert "Make csharp-mode-map inherit from prog-mode-map", ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 0027f9c 246/459: Issue #112: Allow whitespace after the `#` in a directive., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode bd54e4d 250/459: Add csharp group definition, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 331b45d 251/459: Try fix/update CI-settings, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 85ae15d 252/459: Hacky formatting trick to make codedoc work with Omnisharp defaults, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 461cd87 254/459: Fix compilation error on Emacs 26., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode ba7a81a 253/459: Advise c-inside-bracelist-p (#122),
ELPA Syncer <=
- [elpa] externals/csharp-mode 5bfd3d2 257/459: Fix fontification of namespaces in using-statements., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 561c359 258/459: Fix fontification in Emacs27., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode c66916e 259/459: Update version/meta-data., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 239527c 263/459: Protect dmode from ccmode monkeypatch (#134), ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode f3aff25 261/459: Try to properly silence warnings., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 643c63e 268/459: Highlight "value" as a constant., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode fcd092d 266/459: Add Emacs 26 to CI., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 2381280 269/459: Remove excess (incorrect) comment., ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 30ae136 277/459: Merge pull request #150 from josteink/josteink-CI-fix, ELPA Syncer, 2021/08/22
- [elpa] externals/csharp-mode 57bd21b 279/459: Merge pull request #152 from DamienCassou/typos, ELPA Syncer, 2021/08/22