Skip to content

Commit 4a73854

Browse files
authored
Merge pull request #777 from gschuager/skip-project-json
Drop project.json support Closes #776
2 parents 602d042 + 014f587 commit 4a73854

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

autoload/OmniSharp.vim

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,6 @@ function! s:FindSolutionsFiles(bufnr) abort
491491

492492
while dir !=# lastfolder
493493
let solution_files += s:globpath(dir, '*.sln')
494-
let solution_files += s:globpath(dir, 'project.json')
495494

496495
call filter(solution_files, 'filereadable(v:val)')
497496

autoload/OmniSharp/util.vim

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ let s:save_cpo = &cpoptions
22
set cpoptions&vim
33

44
let s:dir_separator = fnamemodify('.', ':p')[-1 :]
5-
let s:roslyn_server_files = 'project.json'
65
let s:plugin_root_dir = expand('<sfile>:p:h:h:h')
76

87
function! s:is_msys() abort
@@ -146,12 +145,7 @@ function! OmniSharp#util#GetServerPath() abort
146145
endfunction
147146

148147
function! OmniSharp#util#GetStartCmd(solution_file) abort
149-
let solution_path = a:solution_file
150-
if fnamemodify(solution_path, ':t') ==? s:roslyn_server_files
151-
let solution_path = fnamemodify(solution_path, ':h')
152-
endif
153-
154-
let solution_path = OmniSharp#util#TranslatePathForServer(solution_path)
148+
let solution_path = OmniSharp#util#TranslatePathForServer(a:solution_file)
155149

156150
if exists('g:OmniSharp_server_path')
157151
let s:server_path = g:OmniSharp_server_path

0 commit comments

Comments
 (0)