start work on reducing interaction with the ST api to (hopefully) reduce latency

also add support for 9o completions via the QueryCmdCompletions action

Author: DisposaBoy

gosubl/margo.py

@@ -3,11 +3,13 @@
 from .margo_agent import MargoAgent
 from .margo_common import OutputLogger, TokenCounter
 from .margo_render import render, render_src
-from .margo_state import State, actions, client_actions, Config, _view_scope_lang, view_is_9o
+from .margo_state import State, actions, client_actions, Config, _view_scope_lang, view_is_9o, MgView
 from collections import namedtuple
 import glob
 import os
+import shlex
 import sublime
+import threading
 import time
 
 class MargoSingleton(object):
@@ -29,6 +31,9 @@ def __init__(self):
 			client_actions.CmdOutput: self._handle_act_output,
 		}
 
+		self._views = {}
+		self._view_lock = threading.Lock()
+
 	def render(self, rs=None):
 		# ST has some locking issues due to its "thread-safe" API
 		# don't access things like sublime.active_view() directly
@@ -110,35 +115,90 @@ def enabled(self, view):
 		return lang in self.enabled_for_langs
 
 	def can_trigger_event(self, view, allow_9o=False):
-		if not self.enabled(view):
-			return False
+		_pf=_dbg.pf()
 
 		if view is None:
 			return False
 
-		if view.is_loading():
+		if not self.enabled(view):
 			return False
 
-		vs = view.settings()
-		if allow_9o and view_is_9o(view):
+		mgv = self.view(view.id(), view=view)
+		if allow_9o and mgv.is_9o:
 			return True
 
-		if vs.get('is_widget'):
+		if not mgv.is_file:
 			return False
 
 		return True
 
+	def _preload_views(self):
+		for w in sublime.windows():
+			for v in w.views():
+				if v is not None:
+					self.view(v.id(), view=v)
+
+	def view(self, id, view=None):
+		with self._view_lock:
+			mgv = self._views.get(id)
+
+			if view is not None:
+				if mgv is None:
+					mgv = MgView(mg=self, view=view)
+					self._views[mgv.id] = mgv
+				else:
+					mgv.sync(view=view)
+
+			return mgv
+
+	def _sync_view(self, event, view):
+		if event in ('pre_close', 'close'):
+			with self._view_lock:
+				self._views.pop(view.id(), None)
+
+			return
+
+		_pf=_dbg.pf(dot=event)
+
+		file_ids = []
+		for w in sublime.windows():
+			for v in w.views():
+				file_ids.append(v.id())
+
+		self.file_ids = file_ids
+
+		self.view(view.id(), view=view)
+
 	def event(self, name, view, handler, args):
-		allow_9o = name in (
-		)
-		if not self.can_trigger_event(view, allow_9o=allow_9o):
+		if view is None:
 			return None
 
-		try:
-			return handler(*args)
-		except Exception:
-			gs.error_traceback('mg.event:%s' % handler)
-			return None
+		_pf=_dbg.pf(dot=name)
+
+		def handle_event(gt=0):
+			if gt > 0:
+				_pf.gt=gt
+
+			self._sync_view(name, view)
+
+			if not self.can_trigger_event(view):
+				return None
+
+			try:
+				return handler(*args)
+			except Exception:
+				gs.error_traceback('mg.event:%s' % handler)
+				return None
+
+		blocking = (
+			'pre_save',
+			'query_completions',
+		)
+
+		if name in blocking:
+			return handle_event(gt=0.100)
+
+		sublime.set_timeout(handle_event)
 
 	def agent_starting(self, ag):
 		if ag is not self.agent:
@@ -172,20 +232,69 @@ def send(self, *, actions=[], cb=None, view=None):
 		self._send_start()
 		return self.agent.send(actions=actions, cb=cb, view=view)
 
+	def on_new(self, view):
+		pass
+
+	def on_pre_close(self, view):
+		pass
+
 	def on_query_completions(self, view, prefix, locations):
 		_, lang = _view_scope_lang(view, 0)
 		if not lang:
 			return None
 
-		rs = self.send(view=view, actions=[actions.QueryCompletions]).wait(0.500)
+		act = actions.QueryCompletions
+		if lang == 'cmd-prompt':
+			act = self._cmd_completions_act(view, prefix, locations)
+			if not act:
+				return None
+
+			view = gs.active_view(win=view.window())
+			if view is None:
+				return None
+
+		rs = self.send(view=view, actions=[act]).wait(0.500)
 		if not rs:
 			self.out.println('aborting QueryCompletions. it did not respond in time')
 			return None
 
+		if rs.error:
+			self.out.println('completion error: %s: %s' % (act, rs.error))
+			return
+
 		cl = [c.entry() for c in rs.state.completions]
 		opts = rs.state.config.auto_complete_opts
 		return (cl, opts) if opts != 0 else cl
 
+	def _cmd_completions_act(self, view, prefix, locations):
+		pos = locations[0]
+		line = view.line(pos)
+		src = view.substr(line)
+		if '#' not in src:
+			return None
+
+		i = src.index('#')
+		while src[i] == ' ' or src[i] == '#':
+			i += 1
+
+		src = src[i:]
+		pos = pos - line.begin() - i
+		name = ''
+		args = shlex.split(src)
+		if args:
+			name = args[0]
+			args = args[1:]
+
+		act = actions.QueryCmdCompletions.copy()
+		act['Data'] = {
+			'Pos': pos,
+			'Src': src,
+			'Name': name,
+			'Args': args,
+		}
+
+		return act
+
 	def on_activated(self, view):
 		self.queue(view=view, actions=[actions.ViewActivated])
 
@@ -269,6 +378,7 @@ def ext_fn():
 
 def gs_init(_):
 	mg._ready = True
+	sublime.set_timeout(mg._preload_views)
 	mg.start()
 
 def gs_fini(_):

gosubl/margo_state.py

@@ -8,6 +8,7 @@
 
 actions = NS(**{k: {'Name': k} for k in (
 	'QueryCompletions',
+	'QueryCmdCompletions',
 	'QueryTooltips',
 	'QueryIssues',
 	'QueryUserCmds',
@@ -28,10 +29,45 @@
 	'CmdOutput',
 )})
 
+class MgView(sublime.View):
+	def __init__(self, *, mg, view):
+		self.mg = mg
+		self.is_9o = False
+		self.is_file = False
+		self.is_widget = False
+		self.sync(view=view)
+
+	def sync(self, *, view):
+		if view is None:
+			return
+
+		_pf=_dbg.pf(dot=self.id)
+		self.id = view.id()
+		self.view = view
+		self.name = view_name(view)
+		self.is_file = self.id in self.mg.file_ids
+		self.is_widget = not self.is_file
+
+	def __eq__(self, v):
+		return self.view == v
+
+	def __hash__(self):
+		return self.id
+
+	def __repr__(self):
+		return repr(vars(self))
+
+	def name(self):
+		return view_name(self.view)
+
 class Config(object):
 	def __init__(self, m):
+		efl = m.get('EnabledForLangs')
+		if not isinstance(efl, list) or len(efl) == 0:
+			print('MARGO BUG: EnabledForLangs is invalid. It must be a non-empty list, not `%s: %s`' % (type(efl), efl))
+
 		self.override_settings = m.get('OverrideSettings') or {}
-		self.enabled_for_langs = m.get('EnabledForLangs') or []
+		self.enabled_for_langs = efl or ['*']
 		self.inhibit_explicit_completions = m.get('InhibitExplicitCompletions') is True
 		self.inhibit_word_completions = m.get('InhibitWordCompletions') is True
 		self.auto_complete_opts = 0
@@ -303,17 +339,29 @@ def _view_hash(view):
 
 	return 'id=%s,change=%d' % (_view_id(view), view.change_count())
 
-_scope_lang_pat = re.compile(r'source[.]([^\s.]+)')
+_scope_lang_pat = re.compile(r'(?:source|text)[.]([^\s.]+)')
 def _view_scope_lang(view, pos):
 	if view is None:
 		return ('', '')
 
+	_pf=_dbg.pf()
 	scope = view.scope_name(pos).strip().lower()
+
 	if view_is_9o(view):
-		return (scope, 'cmd-promp')
+		return (scope, 'cmd-prompt')
 
 	l = _scope_lang_pat.findall(scope)
-	lang = l[-1] if l else ''
+	if not l:
+		return (scope, '')
+
+	blacklist = (
+		'plain',
+		'find-in-files',
+	)
+	lang = l[-1]
+	if lang in blacklist:
+		return (scope, '')
+
 	return (scope, lang)
 
 def _view_src(view, lang):
@@ -326,6 +374,9 @@ def _view_src(view, lang):
 	if not view.is_dirty():
 		return ''
 
+	if view.is_loading():
+		return ''
+
 	if view.size() > MAX_VIEW_SIZE:
 		return ''
 

gosubl/margo_sublime.py

@@ -11,24 +11,30 @@ class MargoEvents(sublime_plugin.EventListener):
 	def on_query_completions(self, view, prefix, locations):
 		return mg.event('query_completions', view, mg.on_query_completions, [view, prefix, locations])
 
-	def on_activated_async(self, view):
+	def on_activated(self, view):
 		return mg.event('activated', view, mg.on_activated, [view])
 
-	def on_modified_async(self, view):
+	def on_modified(self, view):
 		return mg.event('modified', view, mg.on_modified, [view])
 
-	def on_selection_modified_async(self, view):
+	def on_selection_modified(self, view):
 		return mg.event('selection_modified', view, mg.on_selection_modified, [view])
 
 	def on_pre_save(self, view):
 		return mg.event('pre_save', view, mg.on_pre_save, [view])
 
-	def on_post_save_async(self, view):
+	def on_post_save(self, view):
 		return mg.event('post_save', view, mg.on_post_save, [view])
 
-	def on_load_async(self, view):
+	def on_load(self, view):
 		return mg.event('load', view, mg.on_load, [view])
 
+	def on_new(self, view):
+		return mg.event('new', view, mg.on_new, [view])
+
+	def on_pre_close(self, view):
+		return mg.event('pre_close', view, mg.on_pre_close, [view])
+
 class MargoRenderSrcCommand(sublime_plugin.TextCommand):
 	def run(self, edit, src):
 		render_src(self.view, edit, src)