[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/go-mode ee10287 059/495: Revert "Fix indentation for code
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/go-mode ee10287 059/495: Revert "Fix indentation for code after multi-line function signature" |
Date: |
Sat, 7 Aug 2021 09:04:43 -0400 (EDT) |
branch: elpa/go-mode
commit ee10287f085d69fcc6f9c9bbdb268cc0356bc8fc
Author: Dominik Honnef <dominikh@fork-bomb.org>
Commit: Dominik Honnef <dominikh@fork-bomb.org>
Revert "Fix indentation for code after multi-line function signature"
It broke more than it helped
This reverts commit a5164ac8bd7b7a2b3b7c11831b9c381768fe6653.
Conflicts:
go-mode.el
---
go-mode.el | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/go-mode.el b/go-mode.el
index 77ce50b..7559966 100644
--- a/go-mode.el
+++ b/go-mode.el
@@ -149,12 +149,6 @@ built-ins, functions, and some types.")
(go--backward-irrelevant t)
(looking-back go-dangling-operators-regexp)))
-(defun go-previous-line-has-opening-parenthesis-p ()
- (save-excursion
- (beginning-of-line)
- (go--backward-irrelevant t)
- (looking-back "(")))
-
(defun go-indentation-at-point (point)
(save-excursion
(let (start-nesting (outindent 0))
@@ -169,7 +163,7 @@ built-ins, functions, and some types.")
(>= (go-paren-level) start-nesting))
(skip-chars-backward "^[]{}()")
(backward-char))
- (if (or (go-previous-line-has-dangling-op-p)
(go-previous-line-has-opening-parenthesis-p))
+ (if (go-previous-line-has-dangling-op-p)
(- (current-indentation) tab-width)
(current-indentation)))
(go--backward-irrelevant t)
@@ -188,8 +182,7 @@ built-ins, functions, and some types.")
(if (go-in-string-p)
(go--backward-irrelevant)))
(if (< (go-paren-level) start-nesting)
- (if (go-previous-line-has-opening-parenthesis-p)
- (current-indentation)
+ (progn
(if (go-previous-line-has-dangling-op-p)
(setq outindent tab-width))
(+ (current-indentation) tab-width (- outindent)))
- [nongnu] elpa/go-mode cfc3d50 058/495: add more test cases, (continued)
- [nongnu] elpa/go-mode cfc3d50 058/495: add more test cases, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 63929d2 085/495: get rid of go--flatten, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 850986e 022/495: Do not loop forever in go-beginning-of-defun if point is in comment and there's no function definition before point, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode b91c53e 025/495: save buffer before trying to remove unused imports, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 4371669 029/495: Merge branch 'feature/remove_unused_imports', ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode cd13093 034/495: use inhibit-read-only instead of toggle-read-only, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode b6dfdd4 037/495: Closes gh-5, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 9dbdf22 041/495: Do not skip over strings when checking for dangling operator, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 95c9519 049/495: when searching for anchor for indentation, do not limit search to one line, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 399393a 057/495: remove dead code, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode ee10287 059/495: Revert "Fix indentation for code after multi-line function signature",
ELPA Syncer <=
- [nongnu] elpa/go-mode 79d5860 073/495: improve fontification, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 49b9355 074/495: do not change indentation if in multiline string, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 522543f 077/495: replace several defuns with macros, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 4aeb058 078/495: add cache to go-previous-line-has-dangling-op-p, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 438f671 082/495: update documentation, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode c2366b2 084/495: formatting, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode fb9ab02 087/495: buffer-file-truename is an *abbreviated* truename, so use file-truename instead., ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 745c437 092/495: style fixes, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode c833b77 094/495: Fix cache invalidation for dangling operator cache, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 87c8b6e 096/495: do not use dangling op cache when buffer is narrowed, ELPA Syncer, 2021/08/07