fix #418 - refactor supporting code into its own library

Abstract out Sublime Text-related helpers, utils, etc.
guillermooo · Nov 6, 2014 · c589f06 · c589f06
1 parent 8746884
commit c589f06
Show file tree

Hide file tree

Showing 61 changed files with 271 additions and 363 deletions.
diff --git a/AAA.py b/AAA.py
@@ -14,9 +14,9 @@
 import os
 
 from Dart.lib.sdk import SDK
-from Dart.lib.panels import OutputPanel
+from Dart.sublime_plugin_lib.panels import OutputPanel
 from Dart.lib.error import FatalConfigError
-from Dart.lib.io import touch
+from Dart.sublime_plugin_lib.io import touch
 from Dart.lib import ga
 
 
@@ -52,7 +52,7 @@ def check_install():
     touch(install_record)
     with open(install_record, 'wt') as f:
         f.write('autogenerated file. please do not delete.')
-        
+
     ga.Event(category='actions',
              action='install',
              label='Plugin installed',

diff --git a/__init__.py b/__init__.py
diff --git a/analyzer.py b/analyzer.py
@@ -15,8 +15,8 @@
 import threading
 import time
 
-from Dart import PluginLogger
-from Dart.lib.sublime import after
+from Dart.sublime_plugin_lib import PluginLogger
+from Dart.sublime_plugin_lib.sublime import after
 from Dart.lib.editor_context import EditorContext
 from Dart.lib.error import ConfigError
 from Dart.lib.analyzer import actions
@@ -25,14 +25,14 @@
 from Dart.lib.analyzer.response import Response
 from Dart.lib.analyzer.response import ResponseMaker
 from Dart.lib.analyzer.response import ResponseType
-from Dart.lib.path import find_pubspec_path
-from Dart.lib.path import is_active
-from Dart.lib.path import is_view_dart_script
-from Dart.lib.plat import supress_window
+from Dart.sublime_plugin_lib.path import find_pubspec_path
+from Dart.sublime_plugin_lib.path import is_active
+from Dart.sublime_plugin_lib.path import is_view_dart_script
+from Dart.sublime_plugin_lib.plat import supress_window
 from Dart.lib.sdk import SDK
 from Dart.lib.analyzer.queue import AnalyzerQueue
 from Dart.lib.analyzer.queue import TaskPriority
-from Dart.lib.panels import OutputPanel
+from Dart.sublime_plugin_lib.panels import OutputPanel
 
 
 _logger = PluginLogger(__name__)

diff --git a/cmds_search.py b/cmds_search.py
@@ -8,7 +8,7 @@
 import sublime
 import sublime_plugin
 
-from Dart import PluginLogger
+from Dart.sublime_plugin_lib import PluginLogger
 from Dart import analyzer
 
 

diff --git a/dartlint.py b/dartlint.py
@@ -22,15 +22,15 @@
 import threading
 import queue
 
-from . import PluginLogger
-from .lib.panels import OutputPanel
-from .lib.path import extension_equals
-from .lib.path import is_dart_script
-from .lib.path import is_view_dart_script
-from .lib.plat import is_windows
-from .lib.plat import supress_window
-from .lib.pub_package import PubspecFile
-from .lib.sdk import SDK
+from Dart.sublime_plugin_lib import PluginLogger
+from Dart.lib.panels import OutputPanel
+from Dart.lib.path import extension_equals
+from Dart.lib.path import is_dart_script
+from Dart.lib.path import is_view_dart_script
+from Dart.lib.plat import is_windows
+from Dart.lib.plat import supress_window
+from Dart.lib.pub_package import PubspecFile
+from Dart.lib.sdk import SDK
 
 _logger = PluginLogger(__name__)
 

diff --git a/execute.py b/execute.py
@@ -16,9 +16,9 @@
 
 from Default.exec import ProcessListener
 from Default.exec import AsyncProcess
-from Dart.lib.sublime import after
+from Dart.sublime_plugin_lib.sublime import after
 
-from Dart.lib.panels import OutputPanel
+from Dart.sublime_plugin_lib.panels import OutputPanel
 
 
 class DartExecCommand(sublime_plugin.WindowCommand, ProcessListener):

diff --git a/format.py b/format.py
@@ -5,8 +5,8 @@
 import sublime
 import sublime_plugin
 
-from Dart import PluginLogger
-from Dart.lib.plat import supress_window
+from Dart.sublime_plugin_lib import PluginLogger
+from Dart.sublime_plugin_lib.plat import supress_window
 from Dart.lib.sdk import DartFormat
 
 from subprocess import PIPE

diff --git a/lib/analyzer/actions.py b/lib/analyzer/actions.py
@@ -7,8 +7,8 @@
 
 import sublime
 
-from Dart import PluginLogger
-from Dart.lib.panels import OutputPanel
+from Dart.sublime_plugin_lib import PluginLogger
+from Dart.sublime_plugin_lib.panels import OutputPanel
 
 
 _logger = PluginLogger(__name__)

diff --git a/lib/analyzer/pipe_server.py b/lib/analyzer/pipe_server.py
@@ -10,9 +10,9 @@
 from subprocess import PIPE
 import threading
 
-from Dart import PluginLogger
-from Dart.lib.plat import supress_window
-from Dart.lib.path import pushd
+from Dart.sublime_plugin_lib import PluginLogger
+from Dart.sublime_plugin_lib.plat import supress_window
+from Dart.sublime_plugin_lib.path import pushd
 
 
 _logger = PluginLogger(__name__)

diff --git a/lib/analyzer/queue.py b/lib/analyzer/queue.py
@@ -9,9 +9,9 @@
 
 import threading
 
-from Dart import PluginLogger
-from Dart.lib.path import is_active
-from Dart.lib.path import is_active_path
+from Dart.sublime_plugin_lib import PluginLogger
+from Dart.sublime_plugin_lib.path import is_active
+from Dart.sublime_plugin_lib.path import is_active_path
 
 
 _logger = PluginLogger(__name__)

diff --git a/lib/analyzer/response.py b/lib/analyzer/response.py
@@ -9,7 +9,7 @@
 
 import queue
 
-from Dart import PluginLogger
+from Dart.sublime_plugin_lib import PluginLogger
 
 
 _logger = PluginLogger(__name__)

diff --git a/lib/base_cmds.py b/lib/base_cmds.py
@@ -9,8 +9,8 @@
 import os
 
 from Dart.lib.pub_package import PubPackage
-from Dart.lib.panels import ErrorPanel
-from Dart import PluginLogger
+from Dart.sublime_plugin_lib.panels import ErrorPanel
+from Dart.sublime_plugin_lib import PluginLogger
 
 
 _logger = PluginLogger(__name__)

diff --git a/lib/dart_project.py b/lib/dart_project.py
@@ -4,9 +4,9 @@
 
 import os
 
-from Dart.lib.path import find_pubspec_path
-from Dart.lib.out_there.yaml import load
-from Dart.lib.path import is_view_dart_script
+from Dart.sublime_plugin_lib.path import find_pubspec_path
+from Dart.out_there.yaml import load
+from Dart.sublime_plugin_lib.path import is_view_dart_script
 
 
 class DartProject(object):

diff --git a/lib/editor_context.py b/lib/editor_context.py
@@ -7,7 +7,7 @@
 
 import threading
 
-from Dart.lib.panels import OutputPanel
+from Dart.sublime_plugin_lib.panels import OutputPanel
 
 
 class EditorContext(object):

diff --git a/lib/event.py b/lib/event.py
@@ -2,7 +2,7 @@
 # All rights reserved. Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.)
 
-from Dart import PluginLogger
+from Dart.sublime_plugin_lib import PluginLogger
 
 _logger = PluginLogger(__name__)
 
@@ -14,9 +14,9 @@ class EventSource(object):
 
     handlers = {
         ON_PUB_BUILD: [],
-        ON_DART_RUN: [],        
+        ON_DART_RUN: [],
     }
-    
+
     def raise_event(self, source, name, *args, **kwargs):
         for handler in EventSource.handlers.get(name, []):
             handler(source.__class__.__qualname__, *args, **kwargs)

diff --git a/lib/ga.py b/lib/ga.py
@@ -14,7 +14,7 @@
 import urllib.request
 import random
 
-from Dart import PluginLogger
+from Dart.sublime_plugin_lib import PluginLogger
 from Dart.lib.sdk import SDK