refactored completion code

Author: nosami

.gitignore

@@ -21,6 +21,7 @@
 [Tt]est[Rr]esult
 [Bb]uild[Ll]og.*
 
+*.pyc
 *_i.c
 *_p.c
 *.ilk

autoload/OmniSharp.vim

@@ -23,12 +23,7 @@ function! OmniSharp#Complete(findstart, base)
 
 		return start
 	else
-		let words=[]
-		python getCompletions("words", "s:column", "a:base")
-		if len(words) == 0
-			return -3
-		endif
-		return words
+		return pyeval('Completion().get_completions("s:column", "a:base")')
 	endif
 endfunction
 

plugin/OmniSharp.vim

@@ -10,8 +10,13 @@ augroup END
 let g:OmniSharp_loaded = 1
 
 "Load python/OmniSharp.py
-let s:py_path = join([expand('<sfile>:p:h:h'), "python", "OmniSharp.py"], '/')
-exec "pyfile " . fnameescape(s:py_path)
+let s:py_path = join([expand('<sfile>:p:h:h'), "python"], '/')
+exec "python sys.path.append('" . s:py_path . "')"
+"exec "python from ..python.async.asyncrequest import *" 
+"exec "pyfile " . fnameescape(s:py_path . "/asyncrequest.py") 
+exec "pyfile " . fnameescape(s:py_path . "/Completion.py") 
+exec "pyfile " . fnameescape(s:py_path . "/OmniSharp.py") 
+
 
 let g:OmniSharp_port = get(g:, 'OmniSharp_port', 2000)
 

python/Completion.py

@@ -0,0 +1,29 @@
+import vim, syncrequest, types
+class Completion:
+    def get_completions(self, column, partialWord):
+        parameters = {}
+        parameters['column'] = vim.eval(column)
+        parameters['wordToComplete'] = vim.eval(partialWord)
+
+        parameters['WantDocumentationForEveryCompletionResult'] = \
+            bool(int(vim.eval('g:omnicomplete_fetch_full_documentation')))
+
+        parameters['buffer'] = '\r\n'.join(vim.eval('s:textBuffer')[:])
+
+        response = syncrequest.get_response('/autocomplete', parameters)
+
+
+        enc = vim.eval('&encoding')
+        vim_completions = []
+        if response is not None:
+            for completion in response:
+                complete = {
+                    'word': completion['CompletionText'],
+                    'menu' : completion['DisplayText'],
+                    'info': completion['Description'].replace('\r\n', '\n'),
+                    'icase': 1,
+                    'dup':1
+                }
+                vim_completions.append(complete)
+
+        return vim_completions

python/OmniSharp.py

@@ -1,4 +1,5 @@
-import vim, urllib2, urllib, urlparse, logging, json, os, os.path, cgi, types
+import vim, urllib2, urllib, urlparse, logging, json, os, os.path, cgi, types, threading
+import asyncrequest
 
 logger = logging.getLogger('omnisharp')
 logger.setLevel(logging.WARNING)
@@ -12,7 +13,8 @@
 formatter = logging.Formatter('%(asctime)s %(levelname)s %(message)s')
 hdlr.setFormatter(formatter)
 
-def getResponse(endPoint, additional_parameters=None, timeout=None ):
+
+def getResponse(endPoint, additional_parameters=None, timeout=None):
     parameters = {}
     parameters['line'] = vim.eval('line(".")')
     parameters['column'] = vim.eval('col(".")')
@@ -40,37 +42,7 @@ def getResponse(endPoint, additional_parameters=None, timeout=None ):
         return response.read()
     except Exception:
         vim.command("let g:serverSeenRunning = 0")
-        return ''
-
-
-#All of these functions take vim variable names as parameters
-def getCompletions(ret, column, partialWord):
-    parameters = {}
-    parameters['column'] = vim.eval(column)
-    parameters['wordToComplete'] = vim.eval(partialWord)
-
-    parameters['WantDocumentationForEveryCompletionResult'] = \
-        bool(int(vim.eval('g:omnicomplete_fetch_full_documentation')))
-
-    parameters['buffer'] = '\r\n'.join(vim.eval('s:textBuffer')[:])
-    js = getResponse('/autocomplete', parameters)
-
-    command_base = ("add(" + ret +
-            ", {'word': '%(CompletionText)s', 'menu': '%(DisplayText)s', 'info': \"%(Description)s\", 'icase': 1, 'dup':1 })")
-    enc = vim.eval('&encoding')
-    if js != '':
-        completions = json.loads(js)
-        for completion in completions:
-            try:
-                completion['Description'] = \
-                    completion['Description'].replace('\r\n', '\n')
-                command = command_base % completion
-                if type(command) == types.StringType:
-                    vim.eval(command)
-                else:
-                    vim.eval(command.encode(enc))
-            except:
-                logger.error(command)
+        return None
 
 def findUsages(ret):
     parameters = {}

python/asyncrequest.py

@@ -0,0 +1,61 @@
+import vim, urllib2, urllib, urlparse, logging, json, os, os.path, cgi, types, threading
+
+class ThreadUrl(threading.Thread):
+
+    def __init__(self, url, callback, data, timeout):
+        threading.Thread.__init__(self)
+        self.url = url
+        self.data = data
+        self.timeout = timeout
+        self.callback = callback
+
+    def run(self):
+        try:
+            proxy = urllib2.ProxyHandler({})
+            opener = urllib2.build_opener(proxy)
+            response = opener.open(self.url, self.data, self.timeout)
+            self.callback(response.read())
+        except:
+            self.callback(None)
+
+def urlopen_async(url, callback, data, timeout):
+    thread = ThreadUrl(url, callback, data, timeout)
+    thread.start()
+
+def get_response_async(endPoint, callback, params=None, timeout=None):
+    parameters = {}
+    parameters['line'] = vim.eval('line(".")')
+    parameters['column'] = vim.eval('col(".")')
+    parameters['buffer'] = '\r\n'.join(vim.eval("getline(1,'$')")[:])
+    parameters['filename'] = vim.current.buffer.name
+
+    if params is not None:
+        parameters.update(params)
+
+    if timeout == None:
+        timeout = int(vim.eval('g:OmniSharp_timeout'))
+
+    host = vim.eval('g:OmniSharp_host')
+
+    if vim.eval('exists("b:OmniSharp_host")') == '1':
+        host = vim.eval('b:OmniSharp_host')
+
+    target = urlparse.urljoin(host, endPoint)
+    data = urllib.urlencode(parameters).encode('utf-8')
+
+    def urlopen_callback(data):
+        #print(data)
+        if data is None:
+            vim.command("let g:serverSeenRunning = 0")
+            callback(None)
+        else:
+            vim.command("let g:serverSeenRunning = 1")
+            #jsonStr = data.decode('utf-8')
+            jsonObj = json.loads(data)
+            callback(jsonObj)
+
+    urlopen_async(
+        target,
+        urlopen_callback,
+        data,
+        timeout)

python/syncrequest.py

@@ -0,0 +1,34 @@
+import vim, urllib2, urllib, urlparse, json
+
+def get_response(endPoint, params=None, timeout=None):
+    parameters = {}
+    parameters['line'] = vim.eval('line(".")')
+    parameters['column'] = vim.eval('col(".")')
+    parameters['buffer'] = '\r\n'.join(vim.eval("getline(1,'$')")[:])
+    parameters['filename'] = vim.current.buffer.name
+
+    if params is not None:
+        parameters.update(params)
+
+    if timeout == None:
+        timeout = int(vim.eval('g:OmniSharp_timeout'))
+
+    host = vim.eval('g:OmniSharp_host')
+
+    if vim.eval('exists("b:OmniSharp_host")') == '1':
+        host = vim.eval('b:OmniSharp_host')
+
+    target = urlparse.urljoin(host, endPoint)
+    data = urllib.urlencode(parameters).encode('utf-8')
+
+    proxy = urllib2.ProxyHandler({})
+    opener = urllib2.build_opener(proxy)
+    try:
+        response = opener.open(target, data, timeout)
+        vim.command("let g:serverSeenRunning = 1")
+    except Exception:
+        vim.command("let g:serverSeenRunning = 0")
+        return None
+
+    json_string = response.read()
+    return  json.loads(json_string)