Skip to content

Fixed modify setting file have no effect #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fixed modify setting file have no effect #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 Base File.sublime-settings → DocBlockr.sublime-settings
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions Main.sublime-menu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
{
"command": "open_file", "args":
{
"file": "${packages}/DocBlockr/Base File.sublime-settings"
"file": "${packages}/DocBlockr/DocBlockr.sublime-settings"
},
"caption": "Settings – Default"
},
{
"command": "open_file", "args":
{
"file": "${packages}/User/Base File.sublime-settings"
"file": "${packages}/User/DocBlockr.sublime-settings"
},
"caption": "Settings – User"
},
Expand Down
8 changes: 4 additions & 4 deletions jsdocs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def getParser(view):
scope = view.scope_name(view.sel()[0].end())
res = re.search('\\bsource\\.([a-z+\-]+)', scope)
sourceLang = res.group(1) if res else 'js'
viewSettings = view.settings()
viewSettings = sublime.load_settings("DocBlockr.sublime-settings")

if sourceLang == "php":
return JsdocsPHP(viewSettings)
Expand Down Expand Up @@ -154,7 +154,7 @@ def run(self, edit, inline=False):
def initialize(self, v, inline=False):
point = v.sel()[0].end()

self.settings = v.settings()
self.settings = sublime.load_settings("DocBlockr.sublime-settings")

# trailing characters are put inside the body of the comment
self.trailingRgn = sublime.Region(point, v.line(point).end())
Expand Down Expand Up @@ -1384,7 +1384,7 @@ def run(self, edit):
v = self.view
lineRegion = v.line(v.sel()[0])
line = v.substr(lineRegion)
spaces = max(0, v.settings().get("jsdocs_indentation_spaces", 1))
spaces = max(0, sublime.load_settings("DocBlockr.sublime-settings").get("jsdocs_indentation_spaces", 1))
v.replace(edit, lineRegion, re.sub("^(\\s*\\*)\\s*$", "\\1\n\\1" + (" " * spaces), line))


Expand All @@ -1397,7 +1397,7 @@ class JsdocsWrapLines(sublime_plugin.TextCommand):

def run(self, edit):
v = self.view
settings = v.settings()
settings = sublime.load_settings("DocBlockr.sublime-settings")
rulers = settings.get('rulers')
tabSize = settings.get('tab_size')

Expand Down