Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Further cleanup #223

Merged
merged 30 commits into from
Nov 23, 2019
Merged

Further cleanup #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
385b1ca
Whitespace cleanup
Gastove Oct 20, 2019
1074a3d
Merge `indent-smie` and `indent`
Gastove Oct 20, 2019
e5f8dd7
Alias now-removed fsharp-indent-level
Gastove Oct 20, 2019
eee6bdf
Rename `fsharp-mode-indent` to `fsharp-mode-structure` and clean up
Gastove Oct 20, 2019
91c0ace
So Much Whitespace Cleanup
Gastove Oct 20, 2019
1515793
A little extra commentary, attributions
Gastove Oct 20, 2019
56e5a4b
Move var, remove old stuff
Gastove Oct 20, 2019
00785f0
Clear out commented-out code, ^Ls
Gastove Oct 20, 2019
6d1ade8
Whitespace and comment cleanup
Gastove Oct 20, 2019
05b4bba
Update `fsharp-point` to use `save-mark-and-excursion`
Gastove Oct 20, 2019
82e61d6
More comments and whitespace
Gastove Oct 20, 2019
cc91913
Refactoring Pass: Extract Method from `fsharp-compute-indentation`
Gastove Oct 22, 2019
cb55d1c
First working tests for structure
Gastove Oct 22, 2019
c08039a
`continuation-p` transparently duplicates `fsharp-continuation-line-p`
Gastove Oct 23, 2019
05c1ff1
this gives far clearer output without the layer of indirection
Gastove Oct 23, 2019
948a7f3
Implement a basic test for the bewildering `fsharp-backslash-continua…
Gastove Oct 23, 2019
407c353
HUGE notes and comments pass
Gastove Oct 23, 2019
331778c
Organization Pass
Gastove Oct 25, 2019
d7e6c58
Ignore a few files commonly generated by opening or evaluating F# files
Gastove Oct 29, 2019
360f380
Extensive notes; wrap body in save-excursion
Gastove Oct 29, 2019
03976a3
Another save-excursion wrapping
Gastove Oct 29, 2019
132d8b3
Pull the "default" case into its own function
Gastove Oct 29, 2019
8a18837
A little more notes, a few logic corrections
Gastove Oct 29, 2019
e12e2fe
One last note
Gastove Oct 29, 2019
ac9239b
Get new functions under test!
Gastove Oct 29, 2019
730abb6
Another round of comments and notes
Gastove Nov 1, 2019
f144081
Notes, name updates, docstrings
Gastove Nov 1, 2019
b38c74a
More name consistency, more docstrings
Gastove Nov 1, 2019
0d41c65
Clean up note, switch to bobp over clever nil checking
Gastove Nov 1, 2019
013944b
Update tests; add test files
Gastove Nov 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ tmp
emacs-fsharp-mode-bin/

# Dependency archive
fsautocomplete-*.zip
fsautocomplete-*.zip

# Development
obj/
.ionide/
34 changes: 17 additions & 17 deletions flycheck-fsharp.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,30 +40,30 @@
(defun flycheck-verify-fsautocomlete (_checker)
"Verify the F# syntax checker."
(let* ((host (fsharp-ac--hostname (buffer-file-name)))
(process (fsharp-ac-completion-process host))
(status (when process (process-status process)))
(project-file (when (eq status 'run) (fsharp-ac--in-project-p (buffer-file-name))))
(projects (when (eq status 'run) (hash-table-keys fsharp-ac--project-data)))
(command (when process (combine-and-quote-strings (process-command process)))))
(process (fsharp-ac-completion-process host))
(status (when process (process-status process)))
(project-file (when (eq status 'run) (fsharp-ac--in-project-p (buffer-file-name))))
(projects (when (eq status 'run) (hash-table-keys fsharp-ac--project-data)))
(command (when process (combine-and-quote-strings (process-command process)))))
(cons
(flycheck-verification-result-new
:label "FSharp.AutoComplete process"
:message (cond
((eq status 'run) command)
(status (format "Invalid process status: %s (%s)" command status))
("not running"))
((eq status 'run) command)
(status (format "Invalid process status: %s (%s)" command status))
("not running"))
:face (if (eq status 'run) 'success '(bold error)))
(when (eq status 'run)
(list (flycheck-verification-result-new
:label "F# Project"
:message (or project-file "None")
:face (if project-file 'success '(bold warning)))
(flycheck-verification-result-new
:label "Loaded Projects"
:message (if projects
(mapconcat #'identity projects ", ")
"No projects loaded")
:face (if projects 'success '(bold warning))))))))
:label "F# Project"
:message (or project-file "None")
:face (if project-file 'success '(bold warning)))
(flycheck-verification-result-new
:label "Loaded Projects"
:message (if projects
(mapconcat #'identity projects ", ")
"No projects loaded")
:face (if projects 'success '(bold warning))))))))

(defun flycheck-fsharp-fsautocomplete-lint-start (checker callback)
"Start a F# syntax check with CHECKER.
Expand Down
Loading