Skip to content

Commit 77734d6

Browse files
committed
Drop java OpenProject subcommand
1 parent 195a439 commit 77734d6

File tree

3 files changed

+0
-65
lines changed

3 files changed

+0
-65
lines changed

ycmd/completers/java/java_completer.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,6 @@ def GetCustomSubcommands( self ):
358358
'OrganizeImports': (
359359
lambda self, request_data, args: self.OrganizeImports( request_data )
360360
),
361-
'OpenProject': (
362-
lambda self, request_data, args: self._OpenProject( request_data, args )
363-
),
364361
'WipeWorkspace': (
365362
lambda self, request_data, args: self._WipeWorkspace( request_data,
366363
args )
@@ -418,25 +415,6 @@ def _WipeWorkspace( self, request_data, args ):
418415
wipe_config = with_config )
419416

420417

421-
def _OpenProject( self, request_data, args ):
422-
if len( args ) != 1:
423-
raise ValueError( "Usage: OpenProject <project directory>" )
424-
425-
project_directory = args[ 0 ]
426-
427-
# If the dir is not absolute, calculate it relative to the working dir of
428-
# the client (if supplied).
429-
if not os.path.isabs( project_directory ):
430-
if 'working_dir' not in request_data:
431-
raise ValueError( "Project directory must be absolute" )
432-
433-
project_directory = os.path.normpath( os.path.join(
434-
request_data[ 'working_dir' ],
435-
project_directory ) )
436-
437-
self._RestartServer( request_data, project_directory = project_directory )
438-
439-
440418
def _Reset( self ):
441419
if self._workspace_path and self._use_clean_workspace:
442420
try:

ycmd/tests/java/server_management_test.py

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import functools
1919
import os
2020
import psutil
21-
import requests
2221
import time
2322

2423
from unittest.mock import patch
@@ -36,12 +35,10 @@
3635
from ycmd.tests.java import ( PathToTestFile,
3736
isolated_app,
3837
IsolatedYcmd,
39-
SharedYcmd,
4038
StartJavaCompleterServerInDirectory,
4139
StartJavaCompleterServerWithFile )
4240
from ycmd.tests.test_utils import ( BuildRequest,
4341
CompleterProjectDirectoryMatcher,
44-
ErrorMatcher,
4542
MockProcessTerminationTimingOut,
4643
TemporaryTestDir,
4744
WaitUntilCompleterServerReady )
@@ -299,45 +296,6 @@ def test_ServerManagement_ProjectDetection_MavenParent_Submodule( self, app ):
299296
CompleterProjectDirectoryMatcher( project ) )
300297

301298

302-
@SharedYcmd
303-
def test_ServerManagement_OpenProject_RelativePathNoWD( self, app ):
304-
response = app.post_json(
305-
'/run_completer_command',
306-
BuildRequest(
307-
filetype = 'java',
308-
command_arguments = [
309-
'OpenProject',
310-
os.path.join( '..', 'simple_maven_project' ),
311-
],
312-
),
313-
expect_errors = True,
314-
)
315-
assert_that( response.status_code,
316-
equal_to( requests.codes.internal_server_error ) )
317-
assert_that( response.json,
318-
ErrorMatcher( ValueError,
319-
'Project directory must be absolute' ) )
320-
321-
322-
@SharedYcmd
323-
def test_ServerManagement_OpenProject_RelativePathNoPath( self, app ):
324-
response = app.post_json(
325-
'/run_completer_command',
326-
BuildRequest(
327-
filetype = 'java',
328-
command_arguments = [
329-
'OpenProject',
330-
],
331-
),
332-
expect_errors = True,
333-
)
334-
assert_that( response.status_code,
335-
equal_to( requests.codes.internal_server_error ) )
336-
assert_that( response.json,
337-
ErrorMatcher( ValueError,
338-
'Usage: OpenProject <project directory>' ) )
339-
340-
341299
def test_ServerManagement_ProjectDetection_NoParent( self ):
342300
with TemporaryTestDir() as tmp_dir:
343301
with isolated_app() as app:

ycmd/tests/java/subcommands_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ def test_Subcommands_DefinedSubcommands( self, app ):
178178
'GoToReferences',
179179
'GoToType',
180180
'GoToSymbol',
181-
'OpenProject',
182181
'OrganizeImports',
183182
'RefactorRename',
184183
'RestartServer',

0 commit comments

Comments
 (0)