[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/julia-mode 847908e 249/352: Add indent for import and expo
From: |
ELPA Syncer |
Subject: |
[nongnu] elpa/julia-mode 847908e 249/352: Add indent for import and export. |
Date: |
Sun, 29 Aug 2021 11:22:55 -0400 (EDT) |
branch: elpa/julia-mode
commit 847908eb69cfb54ce3cfccd10592808e64bc4ede
Author: Tamas K. Papp <tkpapp@gmail.com>
Commit: Tamas K. Papp <tkpapp@gmail.com>
Add indent for import and export.
---
julia-mode.el | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/julia-mode.el b/julia-mode.el
index abc7c4e..88ca566 100644
--- a/julia-mode.el
+++ b/julia-mode.el
@@ -416,6 +416,30 @@ a keyword if used as a field name, X.word, or quoted,
:word."
(if (condition-case nil (backward-sexp) (error t))
(ignore-errors (backward-char))))
+(defun julia-following-import-export ()
+ "If the current line follows an `export` or `import` keyword
+with valid syntax, return the position of the keyword, otherwise
+`nil`. Works by stepping backwards through comma-separated
+symbol, gives up when this is not true."
+ (let ((done nil))
+ (save-excursion
+ (beginning-of-line)
+ (while (and (not done) (< 0 (point)))
+ (julia-safe-backward-sexp)
+ (cond
+ ((looking-at (rx "export"))
+ (setf done (point)))
+ ((looking-at (rx "import"
+ (+ space)
+ (opt (* (or word (syntax symbol)))
+ (0+ space) ":" (0+ space))))
+ (setf done (point)))
+ ((looking-at (rx (* (or word (syntax symbol))) (0+ space) ",")))
+ (t (setf done 'broken)))))
+ (if (eq done 'broken)
+ nil
+ done)))
+
(defun julia-last-open-block-pos (min)
"Return the position of the last open block, if one found.
Do not move back beyond position MIN."
@@ -536,6 +560,11 @@ meaning always increase indent on TAB and decrease on
S-TAB."
;; indenting inside strings
(current-indentation)))))
+(defun julia-indent-import-export ()
+ "Indent offset for lines that follow `import` or `export`, otherwise nil."
+ (when (julia-following-import-export)
+ julia-indent-offset))
+
(defun julia-indent-line ()
"Indent current line of julia code."
(interactive)
@@ -550,6 +579,8 @@ meaning always increase indent on TAB and decrease on
S-TAB."
(julia-paren-indent)
;; indent due to hanging operators (lines ending in an operator)
(julia-indent-hanging)
+ ;; indent for import and export
+ (julia-indent-import-export)
;; Indent according to how many nested blocks we are in.
(save-excursion
(beginning-of-line)
- [nongnu] elpa/julia-mode 9cdad57 187/352: Make julia-char-regex stricter., (continued)
- [nongnu] elpa/julia-mode 9cdad57 187/352: Make julia-char-regex stricter., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode ff5fc36 202/352: julia-mode.el: allow space or no space after :: and <:, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 05f002c 203/352: When indenting code, limit how far back we search., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 70bbe82 204/352: Adding unit tests for indentation., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode ff8adf5 221/352: Add tests for #11684. [ci skip], ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 8ab2a60 222/352: julia-paren-indent skips blanks after paren, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode c8dfbe2 227/352: Declare indentation as customizable, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 011435c 237/352: julia-mode: Fix indent for hanging ops and module, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode c2f0ed8 235/352: julia-mode: Fix prompt regexp, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode a95b06b 252/352: Merge pull request #20 from tpapp/indent-export, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 847908e 249/352: Add indent for import and export.,
ELPA Syncer <=
- [nongnu] elpa/julia-mode 7b1d3fb 253/352: Merge pull request #21 from kshramt/python-paren-indent, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode f591c6d 275/352: Merge pull request #41 from rfourquet/rf/where-return, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 8449c95 295/352: Merge pull request #69 from emmt/master, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 47d2fb0 282/352: Merge pull request #51 from non-Jedi/arg-list, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode e27e6d2 290/352: fix compilation error, silence byte-compiler warnings in emacs>23, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 7102542 304/352: fix tests, ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 646f758 156/352: Don't skip over end keywords., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 11e3904 176/352: Backporting regexp-opt functionality to Emacs 23., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode 36aa038 181/352: Fix julia-in-brackets so it isn't confused by strings, characters or comments., ELPA Syncer, 2021/08/29
- [nongnu] elpa/julia-mode d7a7607 184/352: Make julia-last-open-block-pos a pure function that only returns the position., ELPA Syncer, 2021/08/29