diff --git a/platform/extensions/src/com/intellij/openapi/extensions/Extensions.java b/platform/extensions/src/com/intellij/openapi/extensions/Extensions.java index 1e90381dda96..f9f4467fe4c6 100644 --- a/platform/extensions/src/com/intellij/openapi/extensions/Extensions.java +++ b/platform/extensions/src/com/intellij/openapi/extensions/Extensions.java @@ -84,15 +84,13 @@ public class Extensions { } @NotNull - @SuppressWarnings("unchecked") public static T[] getExtensions(@NotNull ExtensionPointName extensionPointName) { - return (T[])getExtensions(extensionPointName.getName(), null); + return getExtensions(extensionPointName, null); } @NotNull - public static T[] getExtensions(@NotNull ExtensionPointName extensionPointName, AreaInstance areaInstance) { - // keep it until 1.7 JDK - return Extensions.getExtensions(extensionPointName.getName(), areaInstance); + public static T[] getExtensions(@NotNull ExtensionPointName extensionPointName, @Nullable AreaInstance areaInstance) { + return getExtensions(extensionPointName.getName(), areaInstance); } @NotNull diff --git a/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java b/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java index 8b1e9df06a67..80486ed7939a 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java +++ b/platform/lang-impl/src/com/intellij/refactoring/actions/ExtractIncludeAction.java @@ -78,6 +78,7 @@ public class ExtractIncludeAction extends BasePlatformRefactoringAction { return null; } + @Override @Nullable protected RefactoringActionHandler getRefactoringHandler(@NotNull RefactoringSupportProvider provider, PsiElement element) { return getHandler(element); diff --git a/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java b/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java index 1efcfd050afb..4767a6919cf0 100644 --- a/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java +++ b/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java @@ -28,6 +28,7 @@ import com.intellij.openapi.roots.impl.libraries.LibraryTableBase; import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.project.ProjectKt; +import com.intellij.util.JdomKt; import org.jdom.Element; import org.jdom.JDOMException; import org.jetbrains.annotations.NotNull; @@ -35,9 +36,6 @@ import org.jetbrains.annotations.NotNull; import java.io.FileNotFoundException; import java.io.IOException; import java.util.Map; -import java.util.TreeMap; - -import static com.intellij.util.JdomKt.loadElement; /** * @author yole @@ -60,7 +58,7 @@ public class CoreProjectLoader { if (modulesXml == null) throw new FileNotFoundException("Missing 'modules.xml' in " + dotIdea.getPath()); - TreeMap storageData = loadStorageFile(project, modulesXml); + Map storageData = loadStorageFile(project, modulesXml); final Element moduleManagerState = storageData.get("ProjectModuleManager"); if (moduleManagerState == null) { throw new JDOMException("cannot find ProjectModuleManager state in modules.xml"); @@ -90,7 +88,7 @@ public class CoreProjectLoader { } @NotNull - public static TreeMap loadStorageFile(@NotNull ComponentManager componentManager, @NotNull VirtualFile modulesXml) throws JDOMException, IOException { - return FileStorageCoreUtil.load(loadElement(modulesXml.getInputStream()), PathMacroManager.getInstance(componentManager), false); + static Map loadStorageFile(@NotNull ComponentManager componentManager, @NotNull VirtualFile modulesXml) throws JDOMException, IOException { + return FileStorageCoreUtil.load(JdomKt.loadElement(modulesXml.getInputStream()), PathMacroManager.getInstance(componentManager), false); } } diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index 3216f6d947ba..9177d139a552 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -151,6 +151,7 @@ import static org.junit.Assert.*; /** * @author Dmitry Avdeev */ +@TestOnly public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsightTestFixture { private static final Function INTENTION_NAME_FUN = intentionAction -> '"' + intentionAction.getText() + '"'; @@ -745,14 +746,9 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig @Override public void renameElementAtCaretUsingHandler(@NotNull final String newName) { final DataContext editorContext = ((EditorEx)myEditor).getDataContext(); - final DataContext context = new DataContext() { - @Override - public Object getData(final String dataId) { - return PsiElementRenameHandler.DEFAULT_NAME.getName().equals(dataId) - ? newName - : editorContext.getData(dataId); - } - }; + final DataContext context = dataId -> PsiElementRenameHandler.DEFAULT_NAME.getName().equals(dataId) + ? newName + : editorContext.getData(dataId); final RenameHandler renameHandler = RenameHandlerRegistry.getInstance().getRenameHandler(context); assertNotNull("No handler for this context", renameHandler); @@ -788,7 +784,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig @Override public void type(final char c) { assertInitialized(); - ApplicationManager.getApplication().invokeAndWait((Runnable)() -> { + ApplicationManager.getApplication().invokeAndWait(() -> { final EditorActionManager actionManager = EditorActionManager.getInstance(); if (c == '\b') { performEditorAction(IdeActions.ACTION_EDITOR_BACKSPACE); @@ -1139,7 +1135,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig public void checkResult(@NotNull String text, boolean stripTrailingSpaces) { new WriteCommandAction(getProject()) { @Override - protected void run(@NotNull Result result) throws Throwable { + protected void run(@NotNull Result result) { PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); EditorUtil.fillVirtualSpaceUntilCaret(myEditor); checkResult("TEXT", stripTrailingSpaces, SelectionAndCaretMarkupLoader.fromText(text), getHostFile().getText()); @@ -1151,7 +1147,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig public void checkResult(@NotNull String filePath, @NotNull String text, boolean stripTrailingSpaces) { new WriteCommandAction(getProject()) { @Override - protected void run(@NotNull Result result) throws Throwable { + protected void run(@NotNull Result result) { PsiDocumentManager.getInstance(getProject()).commitAllDocuments(); PsiFile psiFile = getFileToCheck(filePath); checkResult("TEXT", stripTrailingSpaces, SelectionAndCaretMarkupLoader.fromText(text), psiFile.getText()); @@ -1295,7 +1291,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig if (fileTypeManager.getFileTypeByExtension(extension) != fileType) { new WriteCommandAction(getProject()) { @Override - protected void run(@NotNull Result result) throws Exception { + protected void run(@NotNull Result result) { fileTypeManager.associateExtension(fileType, extension); } }.execute(); @@ -1650,7 +1646,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig Arrays.asList(myEditor.getFoldingModel().getAllFoldRegions()), FOLD, foldRegion -> "text=\'" + foldRegion.getPlaceholderText() + "\'" - + (withCollapseStatus ? (" expand=\'" + foldRegion.isExpanded() + "\'") : "")); + + (withCollapseStatus ? " expand=\'" + foldRegion.isExpanded() + "\'" : "")); } @NotNull @@ -1999,6 +1995,7 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig } } + @Override @NotNull public Disposable getProjectDisposable() { return myProjectFixture.getTestRootDisposable(); diff --git a/platform/usageView/src/com/intellij/usages/UsageToPsiElementProvider.java b/platform/usageView/src/com/intellij/usages/UsageToPsiElementProvider.java index 2ade4571f858..0bd6f40da87b 100644 --- a/platform/usageView/src/com/intellij/usages/UsageToPsiElementProvider.java +++ b/platform/usageView/src/com/intellij/usages/UsageToPsiElementProvider.java @@ -28,8 +28,7 @@ import org.jetbrains.annotations.Nullable; * @author Konstantin Bulenkov */ public abstract class UsageToPsiElementProvider { - public static final ExtensionPointName EP_NAME = - new ExtensionPointName<>("com.intellij.usageToPsiElementProvider"); + public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.usageToPsiElementProvider"); @Nullable public abstract PsiElement getAppropriateParentFrom(PsiElement element);