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.

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

gitlab service: fix syntax highlighting #20653

Closed

Conversation

afrepues
Copy link
Contributor

Motivation for this change

The syntax highlighting of the Gitlab service file has the usual issue with /* in the shell code. My solution is to escape the slash.

This commit merges cleanly with both master and release-16.09, the merge request for the later is #20651.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

Sorry, something went wrong.

@mention-bot
Copy link

@afrepues, thanks for your PR! By analyzing the history of the files in this pull request, we identified @fpletz, @teh and @offlinehacker to be potential reviewers.

@copumpkin
Copy link
Member

What's the usual issue with /*? I don't actually get what this change is doing or why

@teh
Copy link
Contributor

teh commented Nov 23, 2016

-1 from me, we should fix nix-mode in emacs instead.

@afrepues
Copy link
Contributor Author

@copumpkin syntax highlighting in Emacs gets borked with that one, the rest of the files looks like a comment.

@copumpkin
Copy link
Member

Oh! So this isn't a functionality change in the package, it's purely accounting for a shortcoming in the editor when it sees this file.

In that case, I sort of agree with @teh. I use /* in several files, including ones that would cause mass rebuilds on Darwin, for example, and it seems shitty to have to change their hash just because one editor is parsing this wrong.

@afrepues
Copy link
Contributor Author

@copumpkin agreed, and just checked and there is NixOS/nix#1120 has a solution for this.

I will close both pull requests. Thanks!

@afrepues afrepues closed this Nov 23, 2016
@copumpkin
Copy link
Member

Cool, thanks for the contribution either way!

@teh
Copy link
Contributor

teh commented Nov 23, 2016

Sorry I was a bit brief on phone: Thanks for the contribution!

@LnL7
Copy link
Member

LnL7 commented Nov 23, 2016

Let me just drop this here https://github.com/LnL7/vim-nix 🤡

@afrepues afrepues deleted the fix-gitlab-service-syntax-higlighting branch October 31, 2017 20:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants