Skip to content

Commit 355d223

Browse files
Several improvements.
This commit: 1. Updates the README to correspond to the latest ST & SM builds. 2. Uses color based kind tokens instead of semantic kind tokens so the panel looks good on themes using images textures for kind icons. 3. Several updates to command documentation majorly focusing on the gitflow SM commands.
1 parent f001501 commit 355d223

9 files changed

Lines changed: 75 additions & 11 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Similarly, you can use `CommandsBrowser: Open Wiki` to open the wiki of the repo
4141

4242
2. The list of Sublime Merge commands are limited to what is specific to Sublime Merge (95% of which is git related). However, since Sublime Text & Sublime Merge share a common codebase, there is a decent possibility that a good number of ST commands work in SM as well. They are not listed in SM, because they are already listed in ST. So, together, ST + SM command list should be a good overview of the total number of commands present in both applications together.
4343

44-
This package should be upto date with commands as of **ST Build 4122** & **SM Build 2062**
44+
This package should be upto date with commands as of **ST Build 4125** & **SM Build 2067**
4545

4646
### Settings
4747

sm_commands_metadata/d.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,16 @@
108108
"args": [
109109
{
110110
"name": "prompt",
111+
"doc_string": "Whether to show a confirmation dialog, asking the user to confirm the action.",
112+
"type": "boolean"
113+
},
114+
{
115+
"name": "ref",
116+
"doc_string": null,
117+
"type": "boolean"
118+
},
119+
{
120+
"name": "remote",
111121
"doc_string": null,
112122
"type": "boolean"
113123
}

sm_commands_metadata/g.json

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
},
3333
"gitflow_finish_feature": {
3434
"command_type": "window",
35-
"doc_string": null,
35+
"doc_string": "Merges the given feature branch back into the development branch. Execute 'git flow feature finish <feature_branch> behind the scenes.'",
3636
"args": [
3737
{
3838
"name": "branch",
39-
"doc_string": null,
39+
"doc_string": "The target feature branch. The name should be prefixed by the feature branch prefix set in the git flow config.",
4040
"type": "string"
4141
}
4242
],
@@ -64,6 +64,11 @@
6464
"name": "branch",
6565
"doc_string": null,
6666
"type": "string"
67+
},
68+
{
69+
"name": "message",
70+
"doc_string": "An optional message for the release.",
71+
"type": "string"
6772
}
6873
],
6974
"added": 1072,
@@ -149,13 +154,27 @@
149154
},
150155
"gitflow_start_feature": {
151156
"command_type": "window",
152-
"doc_string": null,
157+
"doc_string": "Creates the given feature branch for git flow.",
158+
"args": [
159+
{
160+
"name": "name",
161+
"doc_string": "The name of the feature branch.",
162+
"type": "string"
163+
}
164+
],
153165
"added": 1072,
154166
"type": "core"
155167
},
156168
"gitflow_start_bugfix": {
157169
"command_type": "window",
158-
"doc_string": null,
170+
"doc_string": "Creates the given release branch for git flow.",
171+
"args": [
172+
{
173+
"name": "name",
174+
"doc_string": "The name of the release branch.",
175+
"type": "string"
176+
}
177+
],
159178
"added": 1072,
160179
"type": "core"
161180
},

sm_commands_metadata/i.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
},
2020
"init_gitflow": {
2121
"command_type": "window",
22-
"doc_string": null,
22+
"doc_string": "Intializes git flow for the given repository.",
2323
"added": 1072,
2424
"type": "core"
2525
}

sm_commands_metadata/o.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,18 @@
7171
],
7272
"added": 1072,
7373
"type": "core"
74+
},
75+
"open_repository": {
76+
"command_type": "window",
77+
"doc_string": null,
78+
"args": [
79+
{
80+
"name": "path",
81+
"doc_string": null,
82+
"type": "string"
83+
}
84+
],
85+
"added": null,
86+
"type": "core"
7487
}
7588
}

sm_commands_metadata/p.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,21 @@
1919
"name": "prompt",
2020
"doc_string": null,
2121
"type": "boolean"
22+
},
23+
{
24+
"name": "branch",
25+
"doc_string": null,
26+
"type": "string"
27+
},
28+
{
29+
"name": "remote",
30+
"doc_string": null,
31+
"type": "string"
32+
},
33+
{
34+
"name": "mode",
35+
"doc_string": null,
36+
"type": "string"
2237
}
2338
],
2439
"added": 1055,

sm_commands_metadata/r.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,5 +101,11 @@
101101
"doc_string": null,
102102
"added": 1055,
103103
"type": "core"
104+
},
105+
"revert_diff_hunk": {
106+
"command_type": "window",
107+
"doc_string": null,
108+
"added": 2051,
109+
"type": "core"
104110
}
105111
}

src/utils/miscellaneous_utils.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ def command_kind_type(command_type):
1616
"""
1717

1818
if command_type == "text":
19-
return (sublime.KIND_ID_NAMESPACE, "T", "Text Command")
19+
return (sublime.KIND_ID_COLOR_BLUISH, "T", "Text Command")
2020

2121
if command_type == "window":
22-
return (sublime.KIND_ID_FUNCTION, "W", "Window Command")
22+
return (sublime.KIND_ID_COLOR_REDISH, "W", "Window Command")
2323

2424
if command_type == "application":
25-
return (sublime.KIND_ID_TYPE, "A", "Application Command")
25+
return (sublime.KIND_ID_COLOR_PURPLISH, "A", "Application Command")
2626

2727
if command_type == "find":
28-
return (sublime.KIND_ID_MARKUP, "F", "Find Command")
28+
return (sublime.KIND_ID_COLOR_YELLOWISH, "F", "Find Command")
2929

3030

3131
def log(message):

st_commands_metadata/m.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
"type": "boolean"
7171
}
7272
],
73-
"type": "core"
73+
"type": "default",
74+
"location": "Default/pane.py"
7475
}
7576
}

0 commit comments

Comments
 (0)