diff options
author | Tor Norbye <tnorbye@google.com> | 2014-07-25 20:12:40 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-24 20:55:36 +0000 |
commit | 6044be7330c93bc8dacb0f63e62da8029f39a16f (patch) | |
tree | 0ba72f5de1949e0527874a799baa224cbe1537e0 /platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java | |
parent | b03a5855292feb8c331815f883fe64372aacd872 (diff) | |
parent | e5266e2343c8d275d79fa0be725180d0fe3a993c (diff) | |
download | idea-6044be7330c93bc8dacb0f63e62da8029f39a16f.tar.gz |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java')
-rw-r--r-- | platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java index 990e64701ce1..3ee4ecc4d65e 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/generation/actions/CommentByLineCommentAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2014 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. @@ -16,9 +16,10 @@ package com.intellij.codeInsight.generation.actions; -import com.intellij.codeInsight.CodeInsightActionHandler; -import com.intellij.codeInsight.actions.BaseCodeInsightAction; +import com.intellij.codeInsight.actions.MultiCaretCodeInsightAction; +import com.intellij.codeInsight.actions.MultiCaretCodeInsightActionHandler; import com.intellij.codeInsight.generation.CommentByLineCommentHandler; +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; @@ -28,19 +29,19 @@ import com.intellij.psi.PsiFile; import com.intellij.lang.LanguageCommenters; import org.jetbrains.annotations.NotNull; -public class CommentByLineCommentAction extends BaseCodeInsightAction implements DumbAware { +public class CommentByLineCommentAction extends MultiCaretCodeInsightAction implements DumbAware { public CommentByLineCommentAction() { setEnabledInModalContext(true); } @NotNull @Override - protected CodeInsightActionHandler getHandler() { + protected MultiCaretCodeInsightActionHandler getHandler() { return new CommentByLineCommentHandler(); } @Override - protected boolean isValidForFile(@NotNull Project project, @NotNull Editor editor, @NotNull final PsiFile file) { + protected boolean isValidFor(@NotNull Project project, @NotNull Editor editor, @NotNull Caret caret, @NotNull final PsiFile file) { final FileType fileType = file.getFileType(); if (fileType instanceof AbstractFileType) { return ((AbstractFileType)fileType).getCommenter() != null; |