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

IDEA-15956 Ctrl-/ does not work in pointcut language

Browse Source
This commit is contained in:
Dmitry Avdeev
2015-01-13 13:07:48 +03:00
parent 2b03432618
commit ef546d1231
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java
+9 -3
View File
@@ -19,14 +19,16 @@ package com.intellij.codeInsight.generation.actions;
import com.intellij.codeInsight.actions.MultiCaretCodeInsightAction;
import com.intellij.codeInsight.actions.MultiCaretCodeInsightActionHandler;
import com.intellij.codeInsight.generation.CommentByLineCommentHandler;
import com.intellij.lang.LanguageCommenters;
import com.intellij.lang.injection.InjectedLanguageManager;
import com.intellij.openapi.editor.Caret;
import com.intellij.openapi.fileTypes.impl.AbstractFileType;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileTypes.FileType;
import com.intellij.openapi.fileTypes.impl.AbstractFileType;
import com.intellij.openapi.project.DumbAware;
import com.intellij.openapi.project.Project;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.lang.LanguageCommenters;
import org.jetbrains.annotations.NotNull;
public class CommentByLineCommentAction extends MultiCaretCodeInsightAction implements DumbAware {
@@ -46,6 +48,10 @@ public class CommentByLineCommentAction extends MultiCaretCodeInsightAction impl
if (fileType instanceof AbstractFileType) {
return ((AbstractFileType)fileType).getCommenter() != null;
}
return LanguageCommenters.INSTANCE.forLanguage(file.getLanguage()) != null || LanguageCommenters.INSTANCE.forLanguage(file.getViewProvider().getBaseLanguage()) != null;
if (LanguageCommenters.INSTANCE.forLanguage(file.getLanguage()) != null ||
LanguageCommenters.INSTANCE.forLanguage(file.getViewProvider().getBaseLanguage()) != null) return true;
PsiElement host = InjectedLanguageManager.getInstance(project).getInjectionHost(file);
return host != null && LanguageCommenters.INSTANCE.forLanguage(host.getLanguage()) != null;
}
}