Support Sublime Merge

[nikhiljha]

https://github.com/sublimehq/sublime_merge/issues/198

Sublime Merge now supports regular Sublime Text themes if they're tweaked a little bit. The linked issue shows what kind of changes need to be made to add support.

[facelessuser]

For anyone who cares, I've been playing around with Dracula, and wanted this to work in Sublime Text and Merge. As Dracula was only available in a tmTheme form, I used the Mariana theme as a base and brought over the Dracula color palette. I made some changes to more match the original Dracula's theme choices up to a point. As Mariana allows for more fine grained highlighting, some things are different and I took some liberties here and there.

Anyways, the point is that it works in merge and gives you the Dracula palette and for the most part should be quite similar to the original. https://github.com/facelessuser/SublimeRandomCrap/blob/master/Son%20of%20Dracula.sublime-color-scheme.

It mainly requires you to drop the scheme in Sublime somewhere (in this example it will be Packages/User) and then you can access it from Merge. Just create in Merge your own Commit Message - Merge Dark.sublime-settings, Diff - Merge Dark.sublime-settings, and File Mode - Merge Dark.sublime-settings files and place the following in each one:

{
    "color_scheme": "Packages/User/Son of Dracula.sublime-color-scheme"
}

Note I called it Son of Dracula as I don't want this to be confused with some official variant, but feel free to run with it and maybe it can be used as a base to get an updated Sublime variant out. Some of the choices I made may not be desired, or I may have missed some tweaks in certain languages as I've just made it recently. Just thought I'd share.

[ryanolsonx]

@zenorocha Would you accept a PR on this one? (if I ported it to .sublime-color-scheme)

[facelessuser]

I've been Playing around with this. The color scheme alone gets you some styling, but obviously more can be done. I've been playing around with it here: https://gist.github.com/facelessuser/62c900d553a82d8965a098c46d99f1d0

This is with the Merge 2004 build dev release. You just drop the file in your Merge's Packages/User folder to override the current dark theme.

If people want to play with it, feel free.

[facelessuser]

Also, in Merge 2 you also have to define Widget - Merge Dark.sublime-settings file and define:

{
    "color_scheme": "Packages/User/Son of Dracula.sublime-color-scheme"
}

Not sure if that is new or I just missed it before.

[zenorocha]

Hey guys, it's great to hear that we're looking to support Sublime Merge.

I'd definitely be open to receive a pull request to move this .tmTheme to a proper .sublime-color-scheme @facelessuser @ryanolsonx

[facelessuser]

Merge theme work is here in a repo you can git clone into your Merge Packages folder. Restart of Merge is probably needed to refresh the theme: https://github.com/facelessuser/merge-dracula-theme. The scheme is Sublime Text compatible, and while merge can use any compatible sublime-color-scheme (that has all the necessary things defined), I figured it is easier to just have a self contained package.

I'm sure there may be something here or there I may have missed since as you use different features in merge, some new element that needs styling may appear, but this is an initial working theme. Feel free to play around.

[ryanolsonx]

@facelessuser That package looks pretty dang good. However, if we convert the Dracula sublime text theme to use .sublime-color-scheme, we shouldn't need another repository. We'd only need to add instructions on how to use the color scheme in Merge (all of those file additions).

[facelessuser]

@ryanolsonx not exactly. Check out Merge Dark.sublime-theme. There are numerous changes there.

If all you want is the Sublime Merge Dark theme with the color scheme being used, they yes, that is fine. If you want a more deep styling, then you need Merge theme overrides as well. It matters not to me which you prefer 🙂. Just letting people know what is currently available.

[facelessuser]

Ended up going with bolder contrast

With such a dark scheme and so many panels touching, it made sense to make the contrast a bit greater. I'll let you guys decide what you want, scheme, theme, or both. It's all available.

[facelessuser]

So this is probably my last update on the public repo for now. I'm not sure if there is interest in any of this, but if so I can be pinged again. Anyways, I think I finally have all the important things themed. Also added a bit more saturation to the theme.

The color scheme is designed in such a way that if people wanted, they could easily create Pro-ish style variants. Information is included in the color scheme itself. The merge theme is adaptive enough that it would pick up the various variants.

I'll preface this with I do not know what the actual Pro variant pallets are, yes I've guessed by analyzing public information and well math to approximate roughly what I think it is. This is mainly for demonstrative purposes and I have no intentions of sharing my findings as I will wait for the author to release his Pro palette to the public if/when he sees fit. I mainly did these so people easily create something similar with the classic palette. If you've purchased Pro, then you could easily update the classic color scheme to create your own personal Pro variant that works in Merge.

Anyways, this is the results:

Hopefully this work can be found as useful to Merge and Sublime Text users alike.

[facelessuser]

Forgot to mention, you no longer have to override the Dark theme. You now can just set theme to Dracula.sublime-theme in your Preferences.sublime-settings file in Merge. That's kind of an important detail...

[nikhiljha]

I've been using your version of the theme for the past few weeks and it's great. Thank you so much!

[facelessuser]

@nikhiljha I'm glad you like it!