Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
deathaxe committed Mar 3, 2023
2 parents 06d504c + e4ab6a7 commit bc7cfb6
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 5 deletions.
4 changes: 4 additions & 0 deletions PACKAGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,10 @@ This file contains a list of possible packages you may need to install to see th

- [QML](https://packagecontrol.io/packages/QML)

## RBS

- [RBS](https://packagecontrol.io/packages/RBS)

## Reach

- [Reach IDE](https://packagecontrol.io/packages/Reach%20IDE)
Expand Down
5 changes: 5 additions & 0 deletions core/icons.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ def init():
log("Initializing icons")

try:
# create hidden overlay package
overlay_path = path.overlay_path()
os.makedirs(overlay_path, exist_ok=True)
open(os.path.join(overlay_path, ".hidden-sublime-package"), "a").close()

general_path = path.overlay_patches_general_path()
if os.path.isdir(general_path):
dump("All the necessary icons are provided")
Expand Down
12 changes: 8 additions & 4 deletions core/themes.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ def _create_general_patch(settings):
log("Preparing general patch")
theme_content = []

row_padding = settings.get("row_padding")
if row_padding:
theme_content.append({"class": "sidebar_tree", "row_padding": row_padding})

color = convert_color_value(settings.get("color"))
opacity = settings.get("opacity")
icon = _patch_icon(None, color, opacity)
Expand All @@ -131,10 +135,6 @@ def _create_general_patch(settings):
if size:
icon["content_margin"] = [size, size]

row_padding = settings.get("row_padding")
if row_padding:
icon["row_padding"] = row_padding

theme_content.append(icon)

color = convert_color_value(settings.get("color_on_hover"))
Expand All @@ -155,6 +155,10 @@ def _create_specific_patch(settings):
log("Preparing specific patch")
theme_content = []

row_padding = settings.get("row_padding")
if row_padding:
theme_content.append({"class": "sidebar_tree", "row_padding": row_padding})

color = convert_color_value(settings.get("color"))
icon = _patch_icon(None, color)

Expand Down
8 changes: 8 additions & 0 deletions icons/icons.json
Original file line number Diff line number Diff line change
Expand Up @@ -2135,6 +2135,14 @@
{
"name": "Ruby",
"scope": "source.ruby"
},
{
"base": "source.rbs",
"extensions": [
"rbs"
],
"name": "Plain Text (RBS)",
"scope": "text.plain.rbs"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion preferences/file_type_ruby.tmPreferences
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<plist version="1.0">
<dict>
<key>scope</key>
<string>source.ruby, source.shell.ruby, text.plain.ruby</string>
<string>source.ruby, source.shell.ruby, text.plain.rbs, text.plain.ruby</string>
<key>settings</key>
<dict>
<key>icon</key>
Expand Down
Empty file added tests/file_type_rbs.rbs
Empty file.

0 comments on commit bc7cfb6

Please sign in to comment.