Permalink
Browse files

Fix: JSON resource format errors

This commit applies all changes required to satisfy the JSON format unittest.
  • Loading branch information...
deathaxe committed Sep 15, 2017
1 parent bf49eef commit 1f2c41d4ad4dbe97b9549073b5c9cd06573b07a5
@@ -117,15 +117,15 @@
"command": "gs_rebase_undo",
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true }
]
},
{
"keys": ["ctrl+y"],
"command": "gs_rebase_redo",
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true }
]
}
]
@@ -117,15 +117,15 @@
"command": "gs_rebase_undo",
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true }
]
},
{
"keys": ["super+y"],
"command": "gs_rebase_redo",
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true }
]
}
]
@@ -118,15 +118,15 @@
"command": "gs_rebase_undo",
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true }
]
},
{
"keys": ["ctrl+y"],
"command": "gs_rebase_redo",
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true }
]
}
]
View
@@ -3,8 +3,8 @@
"caption": "Preferences: GitSavvy Settings",
"command": "edit_settings",
"args": {
"base_file": "${packages}/GitSavvy/GitSavvy.sublime-settings",
"default": "// Settings in here override those in \"GitSavvy/GitSavvy.sublime-settings\",\n\n{\n\t$0\n}\n"}
"base_file": "${packages}/GitSavvy/GitSavvy.sublime-settings",
"default": "// Settings in here override those in \"GitSavvy/GitSavvy.sublime-settings\",\n\n{\n\t$0\n}\n"}
},
{
@@ -38,7 +38,7 @@
},
{
"caption": "git: quick stage current file and fixup",
"command": "gs_quick_stage_current_file_and_fixup",
"command": "gs_quick_stage_current_file_and_fixup"
},
{
"caption": "git: status",
@@ -399,5 +399,5 @@
{
"caption": "git: stash drop",
"command": "gs_stash_drop"
},
}
]
View
@@ -27,7 +27,7 @@
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.inline_diff_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.inline_diff_view.in_cached_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.inline_diff_view.in_cached_mode", "operator": "equal", "operand": false }
]
},
{
@@ -37,7 +37,7 @@
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.inline_diff_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.inline_diff_view.in_cached_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.inline_diff_view.in_cached_mode", "operator": "equal", "operand": false }
]
},
{
@@ -287,7 +287,7 @@
"command": "gs_push",
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true }
]
},
@@ -301,7 +301,7 @@
"args": { "action": "apply" },
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true }
]
},
{
@@ -310,7 +310,7 @@
"args": { "action": "pop" },
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true }
]
},
{
@@ -345,7 +345,7 @@
"args": { "action": "drop" },
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true }
]
},
{
@@ -354,7 +354,7 @@
"args": { "action": "show" },
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.status_view", "operator": "equal", "operand": true }
]
},
@@ -1552,7 +1552,7 @@
"command": "gs_interface_toggle_help",
"context": [
{ "key": "setting.command_mode", "operator": "equal", "operand": false },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true },
{ "key": "setting.git_savvy.rebase_view", "operator": "equal", "operand": true }
]
},
{
@@ -1700,7 +1700,7 @@
"args": { "type": "pick" },
"context": [
{ "key": "setting.git_savvy.git-rebase-todo_view", "operator": "equal", "operand": true },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" }
]
},
{
@@ -1709,7 +1709,7 @@
"args": { "type": "reword" },
"context": [
{ "key": "setting.git_savvy.git-rebase-todo_view", "operator": "equal", "operand": true },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" }
]
},
{
@@ -1718,7 +1718,7 @@
"args": { "type": "edit" },
"context": [
{ "key": "setting.git_savvy.git-rebase-todo_view", "operator": "equal", "operand": true },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" }
]
},
{
@@ -1727,7 +1727,7 @@
"args": { "type": "squash" },
"context": [
{ "key": "setting.git_savvy.git-rebase-todo_view", "operator": "equal", "operand": true },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" }
]
},
{
@@ -1736,7 +1736,7 @@
"args": { "type": "fixup" },
"context": [
{ "key": "setting.git_savvy.git-rebase-todo_view", "operator": "equal", "operand": true },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" }
]
},
{
@@ -1745,7 +1745,7 @@
"args": { "type": "exec" },
"context": [
{ "key": "setting.git_savvy.git-rebase-todo_view", "operator": "equal", "operand": true },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" }
]
},
{
@@ -1754,7 +1754,7 @@
"args": { "type": "drop" },
"context": [
{ "key": "setting.git_savvy.git-rebase-todo_view", "operator": "equal", "operand": true },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" },
{ "key": "selector", "operator": "equal", "operand": "git-savvy.rebase.interactive meta.git-savvy.rebase-interactive.line" }
]
}
]
View
@@ -1,27 +1,27 @@
[
{
"id": "preferences",
"children": [
{
"caption": "Package Settings",
"mnemonic": "P",
"id": "package-settings",
{
"id": "preferences",
"children": [
{
"caption": "GitSavvy",
"children": [
{
"caption": "Settings",
"command": "edit_settings",
"args": {
"base_file": "${packages}/GitSavvy/GitSavvy.sublime-settings",
"default": "// Settings in here override those in \"GitSavvy/GitSavvy.sublime-settings\",\n\n{\n\t$0\n}\n"
}
}
]
}
{
"caption": "Package Settings",
"mnemonic": "P",
"id": "package-settings",
"children": [
{
"caption": "GitSavvy",
"children": [
{
"caption": "Settings",
"command": "edit_settings",
"args": {
"base_file": "${packages}/GitSavvy/GitSavvy.sublime-settings",
"default": "// Settings in here override those in \"GitSavvy/GitSavvy.sublime-settings\",\n\n{\n\t$0\n}\n"
}
}
]
}
]
}
]
}
]
}
}
]
View
@@ -1,7 +1,7 @@
{
"*": {
">=3000": [
"pyyaml"
]
}
"*": {
">=3000": [
"pyyaml"
]
}
}

0 comments on commit 1f2c41d

Please sign in to comment.