From 268d01d92e4bc0a8f2773bd22e3ac903ac6dc41c Mon Sep 17 00:00:00 2001 From: Mihai Toader Date: Tue, 3 Sep 2024 15:59:42 -0700 Subject: [PATCH] Fix CI failures. --- .../buildfile/completion/ExternalWorkspaceLookupElement.java | 4 ++-- .../com/google/idea/blaze/cpp/BlazeConfigurationResolver.java | 2 +- .../google/idea/blaze/cpp/BlazeConfigurationResolverTest.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/base/src/com/google/idea/blaze/base/lang/buildfile/completion/ExternalWorkspaceLookupElement.java b/base/src/com/google/idea/blaze/base/lang/buildfile/completion/ExternalWorkspaceLookupElement.java index 14382643446..4f5408a315c 100644 --- a/base/src/com/google/idea/blaze/base/lang/buildfile/completion/ExternalWorkspaceLookupElement.java +++ b/base/src/com/google/idea/blaze/base/lang/buildfile/completion/ExternalWorkspaceLookupElement.java @@ -44,14 +44,14 @@ protected String getTailText() { @Override public void handleInsert(InsertionContext context) { - Document document = context.getDocument(); - StringLiteral literal = PsiTreeUtil.findElementOfClassAtOffset(context.getFile(), context.getStartOffset(), StringLiteral.class, false); if (literal == null) { super.handleInsert(context); return; } + Document document = context.getDocument(); + context.commitDocument(); // find an remove trailing package path after insert / replace. // current element text looks like `@workspace//`. If this is complete inside an existing workspace name the // result would look like: @workspace//old_workspace_path//. The following bit will remove `old_workspace_path//` diff --git a/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationResolver.java b/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationResolver.java index 404c0bd5855..c913d85c9ab 100644 --- a/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationResolver.java +++ b/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationResolver.java @@ -149,7 +149,7 @@ private static WorkspacePath getWorkspacePathForExternalTarget( Project project, WorkspacePathResolver workspacePathResolver) { if (target.toTargetInfo().getLabel().isExternal()) { - WorkspaceRoot externalWorkspace = WorkspaceHelper.resolveExternalWorkspace(project, + WorkspaceRoot externalWorkspace = WorkspaceHelper.getExternalWorkspace(project, target.getKey().getLabel().externalWorkspaceName()); if (externalWorkspace != null) { diff --git a/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeConfigurationResolverTest.java b/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeConfigurationResolverTest.java index 1b69d7450f2..fc479a858c6 100644 --- a/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeConfigurationResolverTest.java +++ b/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeConfigurationResolverTest.java @@ -826,7 +826,7 @@ public void testExternalDependencyResolvedWhenIsPartOfProject() throws IOExcepti .build(); File externalRoot = WorkspaceHelper.getExternalSourceRoot( - BlazeProjectDataManager.getInstance(project).getBlazeProjectData()); + BlazeProjectDataManager.getInstance(project).getBlazeProjectData()).toFile(); File spyExternalDependencyRoot = spy(new File(externalRoot, "external_dependency")); doReturn(true).when(spyExternalDependencyRoot).isDirectory(); @@ -844,7 +844,7 @@ public void testExternalDependencyResolvedWhenIsPartOfProject() throws IOExcepti try (MockedStatic mockedStatic = Mockito.mockStatic(WorkspaceHelper.class)) { mockedStatic.when( - () -> WorkspaceHelper.resolveExternalWorkspace(Mockito.any(MockProject.class), + () -> WorkspaceHelper.getExternalWorkspace(Mockito.any(MockProject.class), Mockito.any(String.class))).thenReturn(new WorkspaceRoot(spyExternalDependencyRoot)); assertThatResolving(projectView, targetMap).producesConfigurationsFor(