Merge clojure-mode tests into clojure-ts-mode #57
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
Currently `foo/some-var` will fontlock `foo`, but if this item is something that can be dereffed and you type `@foo/some-var`, `foo` is no longer font-locked. Similarly: `*dynamic-var*` is font locked, but `@` breaks the regex. In this change the `@` sign isn't font locked, but the var that follows it is. Conflicts: clojure-mode.el Add tests for dynamic-var and ns/refer fontlock
Everything appearing after the word ns was treated as namespace (.e.g. [ns name]). Now we check if ns is preceded by a (.
E.g. clojure.lang.Var/cloneThreadBindingFrame
Changes syntax highlighting regexp for keywords to match a colon/double-colon only at the beginning of a word, not in the middle. This allows local vars like `foo:bar` to be highlighted correctly instead of like an unknown symbol for the part before the colon and a keyword for the rest. Fixes #653
Must have been moved to the second line by a well-meaning fill operation. Unfortunately, it has no effect on the second line and the tests broke on buttercup 1.34.
* Or this will prevent buttercup tests from working with installed clojure-mode under ELPA directories. * A bit more background: in Debian there is autopkgtest which tests the installed package. dh-elpa enables a mode that runs the same ERT or Buttercup tests against the installed package instead of the source tree. In this case, it will let the tests pass during build phase, but autopkgtest will fail as this custom code will still try to locate the source code which will no longer be available. * I have tested under Debian sbuild that removing the code will let the buttercup tests pass under autopkgtest, but not sure whether this is still required for Eldev to work.
This was done: Prepare a clone of clojure-mode with just contents of test/ ``` $ git clone --no-checkout https://github.com/clojure-emacs/clojure-mode.git ~/work/clojure-mode-tests-only $ cd ~/work/clojure-mode-tests-only $ git filter-branch --subdirectory-filter test -- --all ``` Add it to clojure-ts-mode and merge it ``` $ cd ~/work/clojure-ts-mode $ git remote add clojure-mode-tests ~/work/clojure-mode-tests-only $ git fetch clojure-mode-tests $ git merge --allow-unrelated-histories clojure-mode-tests/master ```
|
Seems like a step in the right direction to me. |
kommen
force-pushed
the
add-clojure-mode-tests
branch
2 times, most recently
from
40ee640 to
34fb609
Compare
|
Got the build green by ignoring all the merged clojure-mode test files for now in eldev: So as discussed in #25 (comment), this just adds the test suite without actually running any of those tests. One thing I was wondering: maybe put the clojure-mode-* tests into a different directory to avoid any confusion? |
|
Yeah, I think that would be prudent and would make it easier to keep track of what needs to be updated for |
kommen
force-pushed
the
add-clojure-mode-tests
branch
from
34fb609 to
1d7f84d
Compare
|
@bbatsov done. Anything else you feel we should tackle before getting this merged? |
|
Nope, I think we're all good here. |
4 tasks
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.
Attempt to address #25: Bring over the clojure-mode test suit and preserve history and contributors.
This was done:
Prepare a clone of clojure-mode with just contents of test/
Add it to clojure-ts-mode and merge it