File tree 1 file changed +10
-3
lines changed
1 file changed +10
-3
lines changed Original file line number Diff line number Diff line change 1
1
import pprint
2
2
import sublime
3
- import json
4
3
from .util import Util
5
4
6
5
# for debug
@@ -12,16 +11,24 @@ def settings(self, attr):
12
11
DEFAULT = 'Packages/MarkdownTOC/MarkdownTOC.sublime-settings'
13
12
files = sublime .find_resources ('MarkdownTOC.sublime-settings' )
14
13
files .remove (DEFAULT )
15
- settings = sublime .decode_value (sublime .load_resource (DEFAULT ))
14
+
15
+ settings = self .decode_value (DEFAULT )
16
16
for f in files :
17
- user_settings = sublime .decode_value (sublime . load_resource ( f ) )
17
+ user_settings = self .decode_value (f )
18
18
if user_settings != None :
19
19
Util .dict_merge (settings , user_settings )
20
20
return settings [attr ]
21
21
22
22
def defaults (self ):
23
23
return self .settings ('defaults' )
24
24
25
+ def decode_value (self , file ):
26
+ # Check json syntax
27
+ try :
28
+ return sublime .decode_value (sublime .load_resource (file ))
29
+ except ValueError as e :
30
+ self .error ('Invalid json in %s: %s' % (file , e ))
31
+
25
32
def log (self , arg ):
26
33
if self .settings ('logging' ) is True :
27
34
arg = str (arg )
You can’t perform that action at this time.
0 commit comments