More refactor on naming

Author: zhengbli

commands/quick_info.py

@@ -5,6 +5,7 @@
 
 class TypescriptQuickInfo(TypeScriptBaseTextCommand):
     """Command currently called only from event handlers"""
+
     def handle_quick_info(self, quick_info_resp_dict):
         if quick_info_resp_dict["success"]:
             info_str = quick_info_resp_dict["body"]["displayString"]
@@ -29,28 +30,29 @@ class TypescriptQuickInfoDoc(TypeScriptBaseTextCommand):
     Command to show the doc string associated with quick info;
     re-runs quick info in case info has changed
     """
+
     def handle_quick_info(self, quick_info_resp_dict):
         if quick_info_resp_dict["success"]:
             info_str = quick_info_resp_dict["body"]["displayString"]
-            # The finfoStr depends on the if result
-            finfoStr = info_str
+            status_info_str = info_str
             doc_str = quick_info_resp_dict["body"]["documentation"]
             if len(doc_str) > 0:
                 if not TOOLTIP_SUPPORT:
-                    docPanel = sublime.active_window().get_output_panel("doc")
-                    docPanel.run_command('typescript_show_doc',
-                                         {'infoStr': info_str,
-                                          'docStr': doc_str})
-                    docPanel.settings().set('color_scheme', "Packages/Color Scheme - Default/Blackboard.tmTheme")
+                    doc_panel = sublime.active_window().get_output_panel("doc")
+                    doc_panel.run_command(
+                        'typescript_show_doc',
+                        {'infoStr': info_str, 'docStr': doc_str}
+                    )
+                    doc_panel.settings().set('color_scheme', "Packages/Color Scheme - Default/Blackboard.tmTheme")
                     sublime.active_window().run_command('show_panel', {'panel': 'output.doc'})
-                finfoStr = info_str + " (^T^Q for more)"
-            self.view.set_status("typescript_info", finfoStr)
+                status_info_str = info_str + " (^T^Q for more)"
+            self.view.set_status("typescript_info", status_info_str)
             if TOOLTIP_SUPPORT:
-                hinfoStr = escape_html(info_str)
-                hdocStr = escape_html(doc_str)
-                html = "<div>" + hinfoStr + "</div>"
+                html_info_str = escape_html(info_str)
+                html_doc_str = escape_html(doc_str)
+                html = "<div>" + html_info_str + "</div>"
                 if len(doc_str) > 0:
-                    html += "<div>" + hdocStr + "</div>"
+                    html += "<div>" + html_doc_str + "</div>"
                 self.view.show_popup(html, location=-1, max_width=800)
         else:
             self.view.erase_status("typescript_info")

commands/rename.py

@@ -59,7 +59,7 @@ def run(self, text, args_json=""):
                         start_line, start_offset = extract_line_offset(inner_location["start"])
                         end_line, end_offset = extract_line_offset(inner_location["end"])
                         apply_edit(text, self.view, start_line, start_offset, end_line,
-                                   end_offset, ntext=new_name)
+                                   end_offset, new_text=new_name)
 
 
 class TypescriptDelayedRenameFile(TypeScriptBaseTextCommand):
@@ -72,4 +72,4 @@ def run(self, text, locs_name=None):
                 start_line, start_offset = extract_line_offset(inner_location['start'])
                 end_line, end_offset = extract_line_offset(inner_location['end'])
                 apply_edit(text, self.view, start_line, start_offset, end_line,
-                           end_offset, ntext=name)
+                           end_offset, new_text=name)

libs/texthelpers.py

@@ -2,8 +2,12 @@
 
 from .globalvars import *
 
+
 class Location:
-    """Object containing line and offset (one-based) of file location"""
+    """Object containing line and offset (one-based) of file location
+
+    Location is a server protocol. Both line and offset are 1-based.
+    """
 
     def __init__(self, line, offset):
         self.line = line
@@ -82,6 +86,7 @@ def extract_line_offset(line_offset):
         offset = line_offset.offset - 1
     return line, offset
 
+
 def escape_html(raw_string):
     """Escape html content
 
@@ -90,12 +95,12 @@ def escape_html(raw_string):
     return raw_string.replace('&', '&amp;').replace('<', '&lt;').replace('>', "&gt;")
 
 
-def left_expand_empty_region(regions):
+def left_expand_empty_region(regions, number=1):
     """Expand region list one to left for backspace change info"""
     result = []
     for region in regions:
         if region.empty():
-            result.append(sublime.Region(region.begin() - 1, region.end()))
+            result.append(sublime.Region(region.begin() - number, region.end()))
         else:
             result.append(region)
     return result
@@ -111,6 +116,7 @@ def right_expand_empty_region(regions):
             result.append(region)
     return result
 
+
 def build_replace_regions(empty_regions_a, empty_regions_b):
     """
     Given two list of cursor locations, connect each pair of locations for form

libs/viewhelpers.py

@@ -232,29 +232,27 @@ def send_replace_changes_for_regions(view, regions, insert_string):
         cli.service.change(view.file_name(), location, end_location, insert_string)
 
 
-def apply_edit(text, view, startl, startc, endl, endc, ntext=""):
+def apply_edit(text, view, start_line, start_offset, end_line, end_offset, new_text=""):
     """Apply a single edit specification to a view"""
-    begin = view.text_point(startl, startc)
-    end = view.text_point(endl, endc)
+    begin = view.text_point(start_line, start_offset)
+    end = view.text_point(end_line, end_offset)
     region = sublime.Region(begin, end)
-    send_replace_changes_for_regions(view, [region], ntext)
+    send_replace_changes_for_regions(view, [region], new_text)
     # break replace into two parts to avoid selection changes
     if region.size() > 0:
         view.erase(text, region)
-    if (len(ntext) > 0):
-        view.insert(text, begin, ntext)
+    if len(new_text) > 0:
+        view.insert(text, begin, new_text)
 
 
 def apply_formatting_changes(text, view, code_edits):
     """Apply a set of edits to a view"""
     if code_edits:
         for code_edit in code_edits[::-1]:
-            startlc = code_edit["start"]
-            (startl, startc) = extract_line_offset(startlc)
-            endlc = code_edit["end"]
-            (endl, endc) = extract_line_offset(endlc)
-            newText = code_edit["newText"]
-            apply_edit(text, view, startl, startc, endl, endc, ntext=newText)
+            start_line, start_offset = extract_line_offset(code_edit["start"])
+            end_line, end_offset = extract_line_offset(code_edit["end"])
+            new_text = code_edit["newText"]
+            apply_edit(text, view, start_line, start_offset, end_line, end_offset, new_text=new_text)
 
 
 def insert_text(view, edit, loc, text):
@@ -268,7 +266,7 @@ def insert_text(view, edit, loc, text):
 
 def format_range(text, view, begin, end):
     """Format a range of locations in the view"""
-    if (not is_typescript(view)):
+    if not is_typescript(view):
         print("To run this command, please first assign a file name to the view")
         return
     check_update_view(view)
@@ -307,4 +305,9 @@ def change_count(view):
         if IS_ST2:
             return info.modify_count
         else:
-            return view.change_count()
+            return view.change_count()
+
+
+# def get_delete_indent_space_number(view, pos):
+#     line, offset =
+#     tab_size = view.settings().get("tab_size", 1)

listeners/idle.py

@@ -82,8 +82,8 @@ def show_error_msgs(self, diagno_event_body, syntactic):
                     for diagno in diagnos:
                         start_location = diagno["start"]
                         end_location = diagno["end"]
-                        (line, offset) = extract_line_offset(start_location)
-                        (end_line, end_offset) = extract_line_offset(end_location)
+                        line, offset = extract_line_offset(start_location)
+                        end_line, end_offset = extract_line_offset(end_location)
                         text = diagno["text"]
                         start = view.text_point(line, offset)
                         end = view.text_point(end_line, end_offset)