Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix-mode
base: 32b013cd622a
Choose a base ref
...
head repository: NixOS/nix-mode
compare: 9043a8d68703
Choose a head ref
  • 6 commits
  • 2 files changed
  • 2 contributors

Commits on May 10, 2020

  1. Revert fix for #94, but leave the test. 

    This reverts commit 32b013c, reversing
changes made to ecf0050.
    @j-piecuch
    j-piecuch committed May 10, 2020
    Copy the full SHA
    2c19243 View commit details
    Browse the repository at this point in the history

  2. Fix testcase file name.

    @j-piecuch
    j-piecuch committed May 10, 2020
    Copy the full SHA
    a0fc6db View commit details
    Browse the repository at this point in the history

  3. Be smarter about tokenizing symbols.

    @j-piecuch
    j-piecuch committed May 10, 2020
    Copy the full SHA
    55985b3 View commit details
    Browse the repository at this point in the history

  4. Remove redundant case in tokenizer. 

    I can't remember why I put it there... this case seems to handle
symbols, but we're already handling them.
    @j-piecuch
    j-piecuch committed May 10, 2020
    Copy the full SHA
    9f24153 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2020

  1. Inline use of signum. 

    `signum` is defined in `cl`, which is not required by `nix-mode`.
I don't think the use of such a simple function warrants an additional
import, so I decided to inline it.
    @j-piecuch
    j-piecuch committed May 11, 2020
    Copy the full SHA
    1ebfda9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #98 from j-piecuch/94-fix 

    Improve symbol tokenization.
    @matthewbauer
    matthewbauer committed May 11, 2020
    Copy the full SHA
    9043a8d View commit details
    Browse the repository at this point in the history