Remove default_ in settings #104

naokazuterada · Sep 30, 2017 · fe53d2f · fe53d2f
1 parent 285c7ba
commit fe53d2f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 31 deletions.
diff --git a/MarkdownTOC.py b/MarkdownTOC.py
@@ -27,7 +27,7 @@ def run(self, edit):
         if not self.find_tag_and_insert(edit):
             sels = self.view.sel()
             for sel in sels:
-                attrs = self.get_settings()
+                attrs = self.get_defaults()
 
                 # add TOCTAG
                 toc = "<!-- MarkdownTOC -->\n"
@@ -54,7 +54,7 @@ def get_toc_open_tag(self):
                 toc_open_tag = {"region": toc_open}
 
                 # settings in user settings
-                settings_user = self.get_settings()
+                settings_user = self.get_defaults()
 
                 # settings in tag
                 tag_str = self.view.substr(toc_open)
@@ -376,23 +376,9 @@ def get_setting(self, attr):
         settings = sublime.load_settings('MarkdownTOC.sublime-settings')
         return settings.get(attr)
 
-    def get_settings(self):
+    def get_defaults(self):
         """return dict of settings"""
-        return {
-            "autoanchor":           self.get_setting('default_autoanchor'),
-            "autolink":             self.get_setting('default_autolink'),
-            "bracket":              self.get_setting('default_bracket'),
-            "depth":                self.get_setting('default_depth'),
-            "remove_image":         self.get_setting('default_remove_image'),
-            "indent":               self.get_setting('default_indent'),
-            "link_prefix":          self.get_setting('default_link_prefix'),
-            "list_bullets":         self.get_setting('default_list_bullets'),
-            "lowercase":            self.get_setting('default_lowercase'),
-            "lowercase_only_ascii": self.get_setting('default_lowercase_only_ascii'),
-            "style":                self.get_setting('default_style'),
-            "uri_encoding":         self.get_setting('default_uri_encoding'),
-            "markdown_preview":     self.get_setting('default_markdown_preview')
-        }
+        return self.get_setting('defaults')
 
     def get_attibutes_from(self, tag_str):
         """return dict of settings from tag_str"""

diff --git a/MarkdownTOC.sublime-settings b/MarkdownTOC.sublime-settings
@@ -1,17 +1,19 @@
 {
-  "default_autoanchor": false,
-  "default_autolink": false,
-  "default_bracket": "square",
-  "default_depth": 2,
-  "default_indent": "\t",
-  "default_remove_image": true,
-  "default_link_prefix": "",
-  "default_list_bullets": "-",
-  "default_lowercase": true,
-  "default_lowercase_only_ascii": true,
-  "default_style": "unordered",
-  "default_uri_encoding": true,
-  "default_markdown_preview": false,
+  "defaults": {
+    "autoanchor": false,
+    "autolink": false,
+    "bracket": "square",
+    "depth": 2,
+    "indent": "\t",
+    "remove_image": true,
+    "link_prefix": "",
+    "list_bullets": "-",
+    "lowercase": true,
+    "lowercase_only_ascii": true,
+    "style": "unordered",
+    "uri_encoding": true,
+    "markdown_preview": false
+  },
   "id_replacements": {
     "-": " ",
     "" : ["&lt;","&gt;","&amp;","&apos;","&quot;","&#60;","&#62;","&#38;","&#39;","&#34;","!","#","$","&","'","(",")","*","+",",","/",":",";","=","_","?","@","[","]","`","\"", ".","<",">","{","}","™","®","©"]