Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions TypeScript.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,14 +273,9 @@ def buildRefInfo(refInfoV):
class EditorClient:
""" A singleton class holding information for the entire application that must be accessible globally"""
def __init__(self):
# load formatting settings and set callbacks for setting changes
settings = sublime.load_settings('Preferences.sublime-settings')
for setting_name in ['tab_size', 'indent_size', 'translate_tabs_to_spaces']:
settings.add_on_change(setting_name, self.load_format_settings)
self.load_format_settings()

# retrieve the path to tsserver.js
# first see if user set the path to the file
settings = sublime.load_settings('Preferences.sublime-settings')
proc_file = settings.get('typescript_proc_file')
if not proc_file:
# otherwise, get tsserver.js from package directory
Expand All @@ -295,11 +290,17 @@ def __init__(self):
self.available_tempfile_list = []
self.tmpseq = 0

# load formatting settings and set callbacks for setting changes
for setting_name in ['tab_size', 'indent_size', 'translate_tabs_to_spaces']:
settings.add_on_change(setting_name, self.load_format_settings)
self.load_format_settings()

def load_format_settings(self):
settings = sublime.load_settings('Preferences.sublime-settings')
self.tab_size = settings.get('tab_size', 4)
self.indent_size = settings.get('indent_size', 4)
self.translate_tab_to_spaces = settings.get('translate_tabs_to_spaces', False)
self.set_features()

def is_st2(self):
if not hasattr(self, '_is_st2'):
Expand Down Expand Up @@ -451,6 +452,7 @@ def open_file(view):
cli.service.open(view.file_name())

def tab_size_changed():
view = active_view()
reconfig_file(view)
clientInfo = cli.get_or_add_file(view.file_name())
clientInfo.pending_changes = True
Expand Down