Internal: specify GitSavvy settings under root node

timbrel · Apr 7, 2018 · 066b126 · 066b126
1 parent 21ca799
commit 066b126
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/GitSavvy.sublime-project b/GitSavvy.sublime-project
@@ -1,4 +1,7 @@
 {
+	"GitSavvy":
+	{
+	},
 	"build_systems":
 	[
 		{
@@ -23,9 +26,6 @@
 	],
 	"settings":
 	{
-		"GitSavvy":
-		{
-		},
 		"rulers":
 		[
 			100,

diff --git a/common/global_events.py b/common/global_events.py
@@ -77,10 +77,8 @@ def run(self):
 
         if project_data is None:
             project_data = {}
-        if "settings" not in project_data:
-            project_data["settings"] = {"GitSavvy": {}}
-        if "GitSavvy" not in project_data["settings"]:
-            project_data["settings"]["GitSavvy"] = {}
+        if "GitSavvy" not in project_data:
+            project_data["GitSavvy"] = {}
 
         self.window.set_project_data(project_data)
 

diff --git a/core/settings.py b/core/settings.py
@@ -8,8 +8,8 @@ def __init__(self, parent=None):
 
     def get(self, key, default=None):
         project_data = sublime.active_window().project_data()
-        if project_data and "settings" in project_data and "GitSavvy" in project_data["settings"]:
-            project_savvy_settings = project_data["settings"]["GitSavvy"]
+        if project_data and "GitSavvy" in project_data:
+            project_savvy_settings = project_data["GitSavvy"]
             if key in project_savvy_settings:
                 return project_savvy_settings.get(key)
         return self.global_settings.get(key, default)

diff --git a/docs/README.md b/docs/README.md
@@ -190,12 +190,9 @@ To open the GitSavvy settings, simply run the `Preferences: GitSavvy Settings` c
 
 ```
 {
-    "settings":
+    "GitSavvy":
     {
-        "GitSavvy":
-        {
-            // GitSavvy settings go here
-        }
+        // GitSavvy settings go here
     }
 }
 ```