From cf62acc6d65ace9671b546cc8d0e21bd750c4ffc Mon Sep 17 00:00:00 2001 From: Nicolay Mitropolsky Date: Thu, 9 Aug 2018 18:42:03 +0300 Subject: [PATCH] `MockUpdateParameterInfoContext` compilation fix for 183 --- .../MockUpdateParameterInfoContext.java | 7 +- .../MockUpdateParameterInfoContext.java.173 | 124 ------------------ 2 files changed, 6 insertions(+), 125 deletions(-) delete mode 100644 idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java.173 diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java index 176336b179d..ea3ec67ab58 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java +++ b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java @@ -102,7 +102,7 @@ public class MockUpdateParameterInfoContext implements UpdateParameterInfoContex return false; } - @Override + //@Override since 181 public UserDataHolderEx getCustomContext() { return null; } @@ -127,4 +127,9 @@ public class MockUpdateParameterInfoContext implements UpdateParameterInfoContex public Editor getEditor() { return myFixture.getEditor(); } + + //@Override since 183 + public boolean isSingleParameterInfo() { + return false; + } } diff --git a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java.173 b/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java.173 deleted file mode 100644 index dd4ca74b3f8..00000000000 --- a/idea/tests/org/jetbrains/kotlin/idea/parameterInfo/MockUpdateParameterInfoContext.java.173 +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright 2010-2015 JetBrains s.r.o. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.jetbrains.kotlin.idea.parameterInfo; - -import com.intellij.lang.parameterInfo.UpdateParameterInfoContext; -import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.project.Project; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture; -import com.intellij.util.ArrayUtil; -import org.jetbrains.annotations.NotNull; - -public class MockUpdateParameterInfoContext implements UpdateParameterInfoContext { - private int myCurrentParameter = -1; - private PsiFile myFile; - private JavaCodeInsightTestFixture myFixture; - - MockUpdateParameterInfoContext(PsiFile file, JavaCodeInsightTestFixture fixture) { - myFile = file; - myFixture = fixture; - } - - - @Override - public void removeHint() { - } - - @Override - public void setParameterOwner(PsiElement o) { - } - - @Override - public PsiElement getParameterOwner() { - return null; - } - - @Override - public void setHighlightedParameter(Object parameter) { - } - - @Override - public Object getHighlightedParameter() { - return null; - } - - @Override - public void setCurrentParameter(int index) { - myCurrentParameter = index; - } - - public int getCurrentParameter() { - return myCurrentParameter; - } - - @Override - public boolean isUIComponentEnabled(int index) { - return false; - } - - @Override - public void setUIComponentEnabled(int index, boolean b) { - } - - @Override - public int getParameterListStart() { - return 0; - } - - @Override - public Object[] getObjectsToView() { - return ArrayUtil.EMPTY_OBJECT_ARRAY; - } - - @Override - public boolean isPreservedOnHintHidden() { - return false; - } - - @Override - public void setPreservedOnHintHidden(boolean value) { - - } - - @Override - public boolean isInnermostContext() { - return false; - } - - @Override - public Project getProject() { - return null; - } - - @Override - public PsiFile getFile() { - return myFile; - } - - @Override - public int getOffset() { - return myFixture.getCaretOffset(); - } - - @NotNull - @Override - public Editor getEditor() { - return myFixture.getEditor(); - } -}