MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

InlineHandlers are back

Browse Source
This commit is contained in:
Dmitry Avdeev
2011-03-31 10:40:42 +04:00
parent 03da5e3868
commit 455882f6a0
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/actions/BasePlatformRefactoringAction.java
+1 -1
View File
@@ -100,7 +100,7 @@ public abstract class BasePlatformRefactoringAction extends BaseRefactoringActio
}
@Nullable
private RefactoringActionHandler getHandler(@NotNull Language language, PsiElement element) {
protected RefactoringActionHandler getHandler(@NotNull Language language, PsiElement element) {
List<RefactoringSupportProvider> providers = LanguageRefactoringSupport.INSTANCE.allForLanguage(language);
if (providers.isEmpty()) return null;
if (element == null && !providers.isEmpty()) return getRefactoringHandler(providers.get(0));
platform/lang-impl/src/com/intellij/refactoring/actions/InlineAction.java
+12
View File
@@ -23,6 +23,7 @@ package com.intellij.refactoring.actions;
import com.intellij.lang.Language;
import com.intellij.lang.refactoring.InlineActionHandler;
import com.intellij.lang.refactoring.InlineHandler;
import com.intellij.lang.refactoring.InlineHandlers;
import com.intellij.lang.refactoring.RefactoringSupportProvider;
import com.intellij.openapi.actionSystem.DataContext;
@@ -36,6 +37,9 @@ import com.intellij.refactoring.inline.InlineRefactoringActionHandler;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.List;
public class InlineAction extends BasePlatformRefactoringAction {
public InlineAction() {
@@ -71,6 +75,14 @@ public class InlineAction extends BasePlatformRefactoringAction {
return new InlineRefactoringActionHandler();
}
@Override
protected RefactoringActionHandler getHandler(@NotNull Language language, PsiElement element) {
RefactoringActionHandler handler = super.getHandler(language, element);
if (handler != null) return handler;
List<InlineHandler> handlers = InlineHandlers.getInlineHandlers(language);
return handlers.isEmpty() ? null : new InlineRefactoringActionHandler();
}
protected boolean isAvailableForLanguage(Language language) {
for(InlineActionHandler handler: Extensions.getExtensions(InlineActionHandler.EP_NAME)) {
if (handler.isEnabledForLanguage(language)) {