[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/go-mode a16e2e0 266/495: Update docstring and comments for
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/go-mode a16e2e0 266/495: Update docstring and comments for go--in-function-p |
Date: |
Sat, 7 Aug 2021 09:05:28 -0400 (EDT) |
branch: elpa/go-mode
commit a16e2e0e1c0be245896fddc182dde602778aa512
Author: Lowe Thiderman <lowe.thiderman@gmail.com>
Commit: Dominik Honnef <dominik@honnef.co>
Update docstring and comments for go--in-function-p
---
go-mode.el | 45 ++++++++++++++++++++++++---------------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/go-mode.el b/go-mode.el
index 0217185..02c4344 100644
--- a/go-mode.el
+++ b/go-mode.el
@@ -1615,28 +1615,31 @@ are below that anonymous function, go to the root
function."
(go-goto-function)))
(defun go--in-function-p (compare-point)
- "Return t if point is inside the function that starts at `compare-point', nil
-otherwise."
- ;; Check that we are not looking at a top level function. If we are,
+ "Return t if `compare-point' is inside the function that point is currently
on.
+This should only be called as a helper when point is looking at \"func\".
+
+Returns nil in all other cases."
+ ;; Check that we are not looking at a top level function. If we are, return
nil.
(when (not (looking-at "^func"))
- (save-excursion
- (go--goto-return-values)
- ;; Try to place the point on the opening brace
- (cond
- ((looking-at "(")
- (forward-list 1)
- (forward-char 1))
- ((not (looking-at "{"))
- (forward-word 1)
- (forward-char 1)))
-
- (when (looking-at "{")
- ;; Go past the body of the function and back inside of it.
- (forward-list 1)
- (backward-char 1)
- ;; Finally, compare if our position is past the assert point.
- ;; Return t if it is.
- (< (point) compare-point)))))
+ (save-excursion
+ (go--goto-return-values)
+ ;; Try to place the point on the opening brace.
+ (cond
+ ((looking-at "(")
+ (forward-list 1)
+ (forward-char 1))
+ ((not (looking-at "{"))
+ (forward-word 1)
+ (forward-char 1)))
+
+ (when (looking-at "{")
+ ;; Go past the body of the function and back inside of it.
+ (forward-list 1)
+ (backward-char 1)
+ ;; Now that point is looking at the closing brace of the function
+ ;; body, compare if our position is earlier in the file than the
+ ;; comparing point. Return t if it is.
+ (< (point) compare-point)))))
(defun go-goto-function-name ()
"Go to the name of the current function.
- [nongnu] elpa/go-mode aa032d9 248/495: Add Taiki Sugawara to AUTHORS, (continued)
- [nongnu] elpa/go-mode aa032d9 248/495: Add Taiki Sugawara to AUTHORS, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 64be4a3 249/495: Merge branch 'godoc_mode', ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 5d53a13 252/495: Update import path of godef, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 15d227a 253/495: gofmt: wrap external commands in `unwind-protect', ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 91c4496 254/495: go-unused-imports-lines escape dot in regexp correctly, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 0b1ec30 255/495: go-unused-imports-lines pass -e to compiler to get all errors, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 46448ea 258/495: Collect all the define-key statements at the bottom, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 8965fa1 261/495: Use forward-list instead of re-search-forward in go-goto-return-value, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 10f7d10 260/495: go-goto-return-value: don't move past pointer, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode b78582a 262/495: Rename go-goto-type-signature to go-goto-method-receiver, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode a16e2e0 266/495: Update docstring and comments for go--in-function-p,
ELPA Syncer <=
- [nongnu] elpa/go-mode 94ffc7a 270/495: go-goto-docstring: insert function name even if empty comment, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 093a492 274/495: Rename go--in-function-p to go--below-anonymous-function, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 2f302d2 279/495: Update go--goto-opening-curly-brace to handle more cases, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 29f3380 280/495: Remove trailing whitespace in go-mode.el, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode dd46d4f 281/495: Modify go--goto-opening-curly-brace to use end-of-defun, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 6fc1f35 282/495: Move go-goto keymap to the rest of the keymap, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 400d2ae 289/495: Add a changelog, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 0f9b5c5 291/495: Add go-packages-function and go-packages-go-list, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode 8c884f3 292/495: Support goimports' new -srcdir flag, ELPA Syncer, 2021/08/07
- [nongnu] elpa/go-mode c65dd39 297/495: Complain about outdated goimports, ELPA Syncer, 2021/08/07