vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

several fixes

Browse Source
This commit is contained in:
Chiel92 2013-06-28 21:15:05 +02:00
parent 37eb1b7521
commit faa6cf3f36
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
python/ycm/completers/cs/cs_completer.py
View File

@ -27,6 +27,7 @@ import urllib2
import urllib import urllib
import urlparse import urlparse
import json import json
import subprocess
class CsharpCompleter( ThreadedCompleter ): class CsharpCompleter( ThreadedCompleter ):
@ -36,8 +37,9 @@ class CsharpCompleter( ThreadedCompleter ):
def __init__( self ): def __init__( self ):
super( CsharpCompleter, self ).__init__() super( CsharpCompleter, self ).__init__()
self.OmniSharp_host = 2000 self.OmniSharpPort = 2000
self._StartServer() self.OmniSharpHost = 'http://localhost:' + str( self.OmniSharpPort )
#self._StartServer()
def SupportedFiletypes( self ): def SupportedFiletypes( self ):
""" Just csharp """ """ Just csharp """
@ -50,8 +52,8 @@ class CsharpCompleter( ThreadedCompleter ):
for completion in self._GetCompletions() ] for completion in self._GetCompletions() ]
def DefinedSubcommands( self ): def DefinedSubcommands( self ):
return [ "StartServer", return [ 'StartServer',
"StopServer" ] 'StopServer' ]
def OnUserCommand( self, arguments ): def OnUserCommand( self, arguments ):
if not arguments: if not arguments:
@ -69,27 +71,33 @@ class CsharpCompleter( ThreadedCompleter ):
if ( not self._ServerIsRunning() ): if ( not self._ServerIsRunning() ):
# Find the solution file # Find the solution file
folder = os.path.dirname( vim.current.buffer.name ) folder = os.path.dirname( vim.current.buffer.name )
solutionfiles = glob.glob1( folder, "*.sln" ) solutionfiles = glob.glob1( folder, '*.sln' )
while not solutionfiles: while not solutionfiles:
lastfolder = folder lastfolder = folder
# Traverse up a level # Traverse up a level
folder = os.path.dirname( folder ) folder = os.path.dirname( folder )
if folder == lastfolder: if folder == lastfolder:
break break
solutionfiles = glob.glob1( folder, "*.sln" ) solutionfiles = glob.glob1( folder, '*.sln' )
if len( solutionfiles ) == 1: if len( solutionfiles ) == 1:
pass # start server here omnisharp = os.path.join( os.path.abspath( os.path.dirname( __file__ ) ), './OmniSharpServer/OmniSharp/bin/Debug/OmniSharp.exe' )
solutionfile = os.path.abspath ( solutionfiles[0] )
command = [ omnisharp, '-p ' + str( self.OmniSharpPort ), '-s ' + solutionfile ]
# Why doesn't this work properly?
# When starting manually in seperate console, everything works
# Maybe due to bothering stdin/stdout redirecting?
subprocess.Popen( command, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE )
else: else:
pass # some other stuff, like notifying vimsupport.PostVimMessage( 'Error starting OmniSharp server: none or multiple solutionfiles are found' )
def _StopServer( self ): def _StopServer( self ):
""" Stop the OmniSharp server """ """ Stop the OmniSharp server """
if ( self._ServerIsRunning() ): self._GetResponse( '/stopserver' )
self._GetResponse( "/stopserver" )
def _ServerIsRunning( self ): def _ServerIsRunning( self ):
""" Check if the OmniSharp server is running """ """ Check if the OmniSharp server is running """
self._StopServer() # temporal fix
return False return False
def _GetCompletions( self ): def _GetCompletions( self ):
@ -101,14 +109,16 @@ class CsharpCompleter( ThreadedCompleter ):
parameters['buffer'] = '\n'.join( vim.current.buffer ) parameters['buffer'] = '\n'.join( vim.current.buffer )
parameters['filename'] = vim.current.buffer.name parameters['filename'] = vim.current.buffer.name
return self._GetResponse( '/autocomplete', parameters ) | [] completions = self._GetResponse( '/autocomplete', parameters )
return completions if completions != None else []
def _GetResponse( self, endPoint, parameters={} ): def _GetResponse( self, endPoint, parameters={} ):
""" Handle communication with server """ """ Handle communication with server """
target = urlparse.urljoin( self.OmniSharp_host , endPoint ) target = urlparse.urljoin( self.OmniSharpHost, endPoint )
parameters = urllib.urlencode( parameters ) parameters = urllib.urlencode( parameters )
try: try:
response = urllib2.urlopen( target, parameters ) response = urllib2.urlopen( target, parameters )
return json.loads( response.read() ) return json.loads( response.read() )
except: except Exception as e:
#vimsupport.PostVimMessage('OmniSharp : Could not connect to ' + target + ': ' + str(e))
return None return None