Indentation Cleanup: First Pass #219
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Clean up tabs, indentation.
These are two modules that do tightly related things. In two separate files, they can't cleanly share variables (`indent-smie` re-defined an indent offset var also defined in `indent`). This commit merges them together and re-names the variable used for offset by the `smie` configs, but does nothing else.
This commit renames `fsharp-mode-indent` and cleans up references to it. It also scoots `fsharp-eval-phrase` next to `fsharp-eval-region` in `fsharp-mode`, where it makes a bit more sense. Tests are all currently passing.
This was referenced Oct 29, 2019
Merged
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR is part of #218
What's here?
This PR does a small set of "clean up" tasks:
indent-regionon everything.fsharp-mode-indentandfsharp-mode-indent-smieinto a single module,fsharp-mode-structure. Updatefsharp-modeaccordingly.indent-smie'sfsharp-indent-levelwithindent'sfsharp-indent-offset; define an alias for backwards compatibility.structureintomode.Indentation has all been done based on my own, current editor configs. If we prefer different configurations, I'm very happy to set them in a
.dir-locals.el, re-run cleanup, and commit them.All tests are passing on my machine. I've been doing some F# editing, and so far, everything seems unchanged.
Also included: I've verified that
smieconfigs are being applied. Several are being overridden byfsharp-mode, in particular:smietries to setindent-line-functionandindent-region-function, but both are overridden. I believe this override is appropriate, as disabling it removes our ability to cycle indentation levels (which is important!). I believe this means this PR effectively also closes #68 .