refactor get code mechanisum

Author: randy3k

build_systems/IPython - Source File.sublime-build

@@ -0,0 +1,5 @@
+{
+    "target": "send_code_exec",
+    "code": "%run \"$file\"",
+    "selector": "source.python"
+}

build_systems/Julia - Source File.sublime-build

@@ -0,0 +1,5 @@
+{
+    "target": "send_code_exec",
+    "code": "include(\"$file\");",
+    "selector": "source.julia"
+}

build_systems/R - Source File.sublime-build

@@ -0,0 +1,5 @@
+{
+    "target": "send_code_exec",
+    "code": "source(\"$file\")",
+    "selector": "source.r"
+}

build_systems/Rcpp - Source File.sublime-build

@@ -0,0 +1,5 @@
+{
+    "target": "send_code_exec",
+    "code": "Rcpp::sourceCpp(\"$file\")",
+    "selector": "source.c++.rcpp"
+}

code_getter/getter.py

@@ -1,8 +1,34 @@
 import sublime
 import re
+import os
 from ..settings import Settings
 
 
+def escape_dquote(cmd):
+    cmd = cmd.replace('\\', '\\\\')
+    cmd = cmd.replace('"', '\\"')
+    return cmd
+
+
+def escape_squote(cmd):
+    cmd = cmd.replace('\\', '\\\\')
+    cmd = cmd.replace("\'", "\'")
+    return cmd
+
+
+PATTERN = re.compile(r"""
+    (?P<quote>["'])
+    (?P<quoted_var>
+        \$ (?: [_a-z][_a-z0-9]*  | \{[^}]*\} )
+    )
+    (?P=quote)
+    |
+    (?P<var>
+        \$ (?: [_a-z][_a-z0-9]*  | \{[^}]*\} )
+    )
+""", re.VERBOSE)
+
+
 class CodeGetter:
 
     def __init__(self, view):
@@ -51,7 +77,7 @@ def advance(self, s):
                 pt = view.text_point(view.rowcol(nextpt.begin())[0], 0)
         view.sel().add(sublime.Region(pt, pt))
 
-    def get_text(self):
+    def get_code(self):
         view = self.view
         cmd = ''
         moved = False
@@ -72,6 +98,37 @@ def get_text(self):
 
         return cmd
 
+    def get_code_above(self):
+        line = int(self.get_line())
+        if not line or line <= 1:
+            return
+        view = self.view
+        region = sublime.Region(0, view.line(view.text_point(line - 2, 0)).end())
+        return view.substr(region)
+
+    def get_selection(self):
+        view = self.view
+        word = view.substr(view.sel()[0])
+        if not word:
+            word = view.substr(view.word(view.sel()[0].begin()))
+        return word
+
+    def get_line(self):
+        view = self.view
+        if len(view.sel()) == 1:
+            row, _ = view.rowcol(view.sel()[0].begin())
+            return str(row + 1)
+
+    def get_current_folder(self):
+        view = self.view
+        fname = view.file_name()
+        window = view.window()
+        if fname:
+            fname = os.path.realpath(fname)
+            for folder in window.folders():
+                if fname.startswith(os.path.realpath(folder) + os.sep):
+                    return folder
+
     def find_inline(self, pattern, pt, scope="-string, -comment"):
         while True:
             result = self.view.find(pattern, pt)
@@ -166,6 +223,41 @@ def block_expand(self, s):
 
         return s
 
+    def resolve(self, code):
+        view = self.view
+        window = view.window()
+        extracted_variables = window.extract_variables()
+
+        variable_getter = {
+            "line": self.get_line,
+            "selection": self.get_selection,
+            "current_folder": self.get_current_folder
+        }
+
+        for v, getter in variable_getter.items():
+            value = getter()
+            if value is not None:
+                extracted_variables[v] = value
+
+        def convert(m):
+            quote = m.group("quote")
+            var = m.group("quoted_var") if quote else m.group("var")
+            if var == "$code_above":
+                var = self.get_code_above()
+            else:
+                var = sublime.expand_variables(var, extracted_variables)
+
+            if quote == "'":
+                return "'" + escape_squote(var) + "'"
+            elif quote == '"':
+                return '"' + escape_dquote(var) + '"'
+            else:
+                return var
+
+        code = PATTERN.sub(convert, code)
+
+        return code
+
 
 class RCodeGetter(CodeGetter):
 
@@ -312,7 +404,9 @@ def expand_line(self, s):
             s = sublime.Region(s.end() + 1, end.begin() - 1)
         return s
 
+    def get_code_above(self):
+        pass
 
-class RMarkDownCodeGetter(MarkDownCodeGetter):
 
+class RMarkDownCodeGetter(MarkDownCodeGetter):
     pass

exec.py

@@ -0,0 +1,15 @@
+import sublime_plugin
+
+
+class SendCodeExecCommand(sublime_plugin.WindowCommand):
+
+    def run(self, code=None, prog=None):
+        self.window.active_view().run_command(
+            "send_code",
+            {"code": code, "prog": prog}
+        )
+
+
+# backward compatibility
+class SendCodeBuildCommand(SendCodeExecCommand):
+    pass

send_code.py

@@ -1,97 +1,29 @@
 import sublime
 import sublime_plugin
-import os
-import re
 
 from .code_getter import CodeGetter
 from .code_sender import CodeSender
 
 
-def escape_dquote(cmd):
-    cmd = cmd.replace('\\', '\\\\')
-    cmd = cmd.replace('"', '\\"')
-    return cmd
-
-
-def escape_squote(cmd):
-    cmd = cmd.replace('\\', '\\\\')
-    cmd = cmd.replace("\'", "\'")
-    return cmd
-
-
-PATTERN = re.compile(r"""
-    (?P<quote>["'])
-    (?P<quoted_var>
-        \$ (?: [_a-z][_a-z0-9]*  | \{[^}]*\} )
-    )
-    (?P=quote)
-    |
-    (?P<var>
-        \$ (?: [_a-z][_a-z0-9]*  | \{[^}]*\} )
-    )
-""", re.VERBOSE)
-
-
 class SendCodeCommand(sublime_plugin.TextCommand):
 
-    def resolve(self, cmd):
-        view = self.view
-        window = view.window()
-        extracted_variables = window.extract_variables()
-        if len(view.sel()) == 1:
-            row, _ = view.rowcol(view.sel()[0].begin())
-            extracted_variables["line"] = str(row + 1)
-
-            word = view.substr(view.sel()[0])
-            if not word:
-                word = view.substr(view.word(view.sel()[0].begin()))
-            extracted_variables["selection"] = word
-
-        fname = view.file_name()
-        if fname:
-            fname = os.path.realpath(fname)
-            for folder in window.folders():
-                if fname.startswith(os.path.realpath(folder) + os.sep):
-                    extracted_variables["current_folder"] = folder
-                    break
-
-        def convert(m):
-            quote = m.group("quote")
-            if quote:
-                var = sublime.expand_variables(m.group("quoted_var"), extracted_variables)
-                if quote == "'":
-                    return "'" + escape_squote(var) + "'"
-                else:
-                    return '"' + escape_dquote(var) + '"'
-            else:
-                return sublime.expand_variables(m.group("var"), extracted_variables)
-
-        cmd = PATTERN.sub(convert, cmd)
-
-        return cmd
-
-    def run(self, edit, cmd=None, prog=None, confirmation=None):
-        # set CodeGetter before get_text() because get_text may change cursor locations.
+    def run(self, edit, code=None, cmd=None, prog=None, resolve=True, confirmation=None):
+        # set CodeSender before get_code() because get_code may change cursor locations.
 
         if confirmation:
             ok = sublime.ok_cancel_dialog(confirmation)
             if not ok:
                 return
 
-        sender = CodeSender.initialize(self.view, prog=prog, from_view=cmd is None)
-        if cmd:
-            cmd = self.resolve(cmd)
-        else:
-            getter = CodeGetter.initialize(self.view)
-            cmd = getter.get_text()
-
-        sublime.set_timeout_async(lambda: sender.send_text(cmd))
+        if not code and cmd:
+            print("SendCode: argument `cmd` is deprecated, use `code` instead.")
+            code = cmd
 
+        getter = CodeGetter.initialize(self.view)
+        sender = CodeSender.initialize(self.view, prog=prog, from_view=code is None)
+        if code and resolve:
+            code = getter.resolve(code)
+        else:
+            code = getter.get_code()
 
-class SendCodeBuildCommand(sublime_plugin.WindowCommand):
-
-    def run(self, cmd=None, prog=None):
-        self.window.active_view().run_command(
-            "send_code",
-            {"cmd": cmd, "prog": prog}
-        )
+        sublime.set_timeout_async(lambda: sender.send_text(code))