diff options
| author | Leonidas Spyropoulos | 2020-04-28 18:15:05 +0100 |
|---|---|---|
| committer | Leonidas Spyropoulos | 2020-04-28 18:15:05 +0100 |
| commit | 97b319053a8c727706173b889e80d2d35b382765 (patch) | |
| tree | 7193f7340d403454fed60e1468fd9e4b73f5739c | |
| parent | c63e2ceb4549c27c58d39b09877e98ef481e87db (diff) | |
| download | aur-97b319053a8c727706173b889e80d2d35b382765.tar.gz | |
Update patches against current codebase
| -rw-r--r-- | omnisharp.patch | 10 | ||||
| -rw-r--r-- | rls.patch | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/omnisharp.patch b/omnisharp.patch index 139698ffc4bb..ffa99a45ae15 100644 --- a/omnisharp.patch +++ b/omnisharp.patch @@ -1,8 +1,8 @@ diff --git a/ycmd/completers/cs/cs_completer.py b/ycmd/completers/cs/cs_completer.py -index 7eda0496..6db93fb8 100644 +index a80e6989..00fe03f7 100644 --- a/ycmd/completers/cs/cs_completer.py +++ b/ycmd/completers/cs/cs_completer.py -@@ -42,12 +42,9 @@ SERVER_NOT_FOUND_MSG = ( 'OmniSharp server binary not found at {0}. ' + +@@ -38,12 +38,9 @@ SERVER_NOT_FOUND_MSG = ( 'OmniSharp server binary not found at {0}. ' + '"./install.py --cs-completer".' ) INVALID_FILE_MESSAGE = 'File is invalid.' NO_DIAGNOSTIC_MESSAGE = 'No diagnostic for current line!' @@ -11,9 +11,9 @@ index 7eda0496..6db93fb8 100644 - '..', '..', '..', 'third_party', 'omnisharp-roslyn' -) +PATH_TO_ROSLYN_OMNISHARP = os.path.join('/','opt','omnisharp-roslyn-http') - PATH_TO_ROSLYN_OMNISHARP_BINARY = os.path.join( + PATH_TO_OMNISHARP_ROSLYN_BINARY = os.path.join( - PATH_TO_ROSLYN_OMNISHARP, 'Omnisharp.exe' ) + PATH_TO_ROSLYN_OMNISHARP, 'OmniSharp.exe' ) - if ( not os.path.isfile( PATH_TO_ROSLYN_OMNISHARP_BINARY ) + if ( not os.path.isfile( PATH_TO_OMNISHARP_ROSLYN_BINARY ) and os.path.isfile( os.path.join( PATH_TO_ROSLYN_OMNISHARP, 'run' ) ) ): - PATH_TO_ROSLYN_OMNISHARP_BINARY = ( + PATH_TO_OMNISHARP_ROSLYN_BINARY = ( diff --git a/rls.patch b/rls.patch index a72804d02769..94e41b7a574d 100644 --- a/rls.patch +++ b/rls.patch @@ -1,10 +1,10 @@ diff --git a/ycmd/completers/rust/rust_completer.py b/ycmd/completers/rust/rust_completer.py -index dc14d6ee..cf5fd77c 100644 +index a5e5caaa..3c886467 100644 --- a/ycmd/completers/rust/rust_completer.py +++ b/ycmd/completers/rust/rust_completer.py -@@ -33,11 +33,9 @@ from ycmd.utils import LOGGER, re - - +@@ -25,11 +25,9 @@ from ycmd.utils import LOGGER, re + + LOGFILE_FORMAT = 'rls_' -RLS_BIN_DIR = os.path.abspath( - os.path.join( os.path.dirname( __file__ ), '..', '..', '..', 'third_party', @@ -13,7 +13,7 @@ index dc14d6ee..cf5fd77c 100644 -RLS_EXECUTABLE = utils.FindExecutable( os.path.join( RLS_BIN_DIR, 'rls' ) ) +RLS_BIN_DIR = '/usr/bin' +RUSTC_EXECUTABLE = os.path.join( RLS_BIN_DIR, 'rustc' ) -+RLS_EXECUTABLE = os.path.join( RLS_BIN_DIR, 'rls' ) ++RLS_EXECUTABLE = os.path.join( RLS_BIN_DIR, 'rls' ) RLS_VERSION_REGEX = re.compile( r'^rls (?P<version>.*)$' ) |