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

more clear name for modification check for viewer (IDEA-CR-17799)

Browse Source
This commit is contained in:
Anna.Kozlova
2017-02-08 11:41:18 +01:00
parent aa2ae1d221
commit f586bcc4d6
22 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class GenerateDelegateHandler implements LanguageCodeInsightActionHandler
@Override
public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
if (!FileDocumentManager.getInstance().requestWriting(editor.getDocument(), project)) {
return;
}
java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java
+1 -1
View File
@@ -69,7 +69,7 @@ public abstract class GenerateMembersHandlerBase implements CodeInsightActionHan
@Override
public final void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
if (!FileDocumentManager.getInstance().requestWriting(editor.getDocument(), project)) {
return;
}
platform/lang-api/src/com/intellij/codeInsight/actions/CodeInsightAction.java
+2 -2
View File
@@ -19,7 +19,7 @@ package com.intellij.codeInsight.actions;
import com.intellij.codeInsight.CodeInsightActionHandler;
import com.intellij.codeInsight.FileModificationService;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.application.*;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.EditorModificationUtil;
@@ -63,7 +63,7 @@ public abstract class CodeInsightAction extends AnAction {
final CodeInsightActionHandler handler = getHandler();
PsiElement elementToMakeWritable = handler.getElementToMakeWritable(psiFile);
if (elementToMakeWritable != null &&
!(EditorModificationUtil.showReadOnlyViewWarning(editor) &&
!(EditorModificationUtil.checkModificationAllowed(editor) &&
FileModificationService.getInstance().preparePsiElementsForWrite(elementToMakeWritable))) {
return;
}
platform/lang-impl/src/com/intellij/codeInsight/CodeInsightUtilBase.java
+2 -2
View File
@@ -101,11 +101,11 @@ public class CodeInsightUtilBase extends CodeInsightUtilCore {
// returns true on success
@Deprecated
public static boolean prepareEditorForWrite(@NotNull Editor editor) {
return EditorModificationUtil.showReadOnlyViewWarning(editor);
return EditorModificationUtil.checkModificationAllowed(editor);
}
@Deprecated
public static void showReadOnlyViewWarning(Editor editor) {
EditorModificationUtil.showReadOnlyViewWarning(editor);
EditorModificationUtil.checkModificationAllowed(editor);
}
}
platform/lang-impl/src/com/intellij/codeInsight/actions/MultiCaretCodeInsightAction.java
+1 -1
View File
@@ -53,7 +53,7 @@ public abstract class MultiCaretCodeInsightAction extends AnAction {
if (hostEditor == null) {
return;
}
if (!EditorModificationUtil.showReadOnlyViewWarning(hostEditor)) return;
if (!EditorModificationUtil.checkModificationAllowed(hostEditor)) return;
PsiFile hostFile = PsiDocumentManager.getInstance(project).getPsiFile(hostEditor.getDocument());
if (hostFile != null && !FileModificationService.getInstance().prepareFileForWrite(hostFile)) return;
platform/lang-impl/src/com/intellij/codeInsight/completion/CodeCompletionHandlerBase.java
+1 -1
View File
@@ -140,7 +140,7 @@ public class CodeCompletionHandlerBase {
int offset = editor.getCaretModel().getOffset();
if (editor.isViewer() || editor.getDocument().getRangeGuard(offset, offset) != null) {
editor.getDocument().fireReadOnlyModificationAttempt();
EditorModificationUtil.showReadOnlyViewWarning(editor);
EditorModificationUtil.checkModificationAllowed(editor);
return;
}
platform/lang-impl/src/com/intellij/codeInsight/completion/actions/HippieWordCompletionHandler.java
+1 -1
View File
@@ -55,7 +55,7 @@ public class HippieWordCompletionHandler implements CodeInsightActionHandler {
int caretOffset = editor.getCaretModel().getOffset();
if (editor.isViewer() || editor.getDocument().getRangeGuard(caretOffset, caretOffset) != null) {
editor.getDocument().fireReadOnlyModificationAttempt();
EditorModificationUtil.showReadOnlyViewWarning(editor);
EditorModificationUtil.checkModificationAllowed(editor);
return;
}
platform/lang-impl/src/com/intellij/codeInsight/editorActions/PasteHandler.java
+1 -1
View File
@@ -79,7 +79,7 @@ public class PasteHandler extends EditorActionHandler implements EditorTextInser
final Transferable transferable = EditorModificationUtil.getContentsToPasteToEditor(producer);
if (transferable == null) return;
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
final Document document = editor.getDocument();
if (!EditorModificationUtil.requestWriting(editor)) {
platform/lang-impl/src/com/intellij/codeInsight/editorActions/TypedHandler.java
+1 -1
View File
@@ -157,7 +157,7 @@ public class TypedHandler extends TypedActionHandlerBase {
return;
}
if (!EditorModificationUtil.showReadOnlyViewWarning(originalEditor)) return;
if (!EditorModificationUtil.checkModificationAllowed(originalEditor)) return;
final PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
final Document originalDocument = originalEditor.getDocument();
platform/lang-impl/src/com/intellij/codeInsight/generation/DelegateMethodsHandler.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
public class DelegateMethodsHandler implements CodeInsightActionHandler{
@Override
public final void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
if (!FileDocumentManager.getInstance().requestWriting(editor.getDocument(), project)){
return;
}
platform/lang-impl/src/com/intellij/codeInsight/generation/ImplementMethodsHandler.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
public class ImplementMethodsHandler implements CodeInsightActionHandler{
@Override
public final void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
if (!FileDocumentManager.getInstance().requestWriting(editor.getDocument(), project)){
return;
}
platform/lang-impl/src/com/intellij/codeInsight/generation/OverrideMethodsHandler.java
+1 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull;
public class OverrideMethodsHandler implements CodeInsightActionHandler{
@Override
public final void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
if (!FileDocumentManager.getInstance().requestWriting(editor.getDocument(), project)){
return;
}
platform/lang-impl/src/com/intellij/codeInsight/generation/surroundWith/SurroundWithHandler.java
+1 -1
View File
@@ -74,7 +74,7 @@ public class SurroundWithHandler implements CodeInsightActionHandler {
}
public static void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file, Surrounder surrounder) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
if (file instanceof PsiCompiledElement) {
HintManager.getInstance().showErrorHint(editor, "Can't modify decompiled code");
return;
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupTypedHandler.java
+1 -1
View File
@@ -66,7 +66,7 @@ public class LookupTypedHandler extends TypedActionHandlerBase {
return;
}
if (!EditorModificationUtil.showReadOnlyViewWarning(originalEditor)) {
if (!EditorModificationUtil.checkModificationAllowed(originalEditor)) {
return;
}
platform/lang-impl/src/com/intellij/codeInsight/template/impl/SurroundWithTemplateHandler.java
+1 -1
View File
@@ -41,7 +41,7 @@ import java.util.Set;
public class SurroundWithTemplateHandler implements CodeInsightActionHandler {
@Override
public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
DefaultActionGroup group = createActionGroup(project, editor, file);
if (group == null) return;
platform/lang-impl/src/com/intellij/codeInsight/unwrap/UnwrapHandler.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class UnwrapHandler implements CodeInsightActionHandler {
@Override
public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
List<AnAction> options = collectOptions(project, editor, file);
selectOption(options, editor, file);
}
platform/platform-api/src/com/intellij/openapi/editor/EditorModificationUtil.java
+2 -2
View File
@@ -28,7 +28,6 @@ import com.intellij.util.Producer;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.datatransfer.DataFlavor;
import java.awt.datatransfer.Transferable;
import java.awt.datatransfer.UnsupportedFlavorException;
@@ -417,8 +416,9 @@ public class EditorModificationUtil {
/**
* @return true when not viewer
* false otherwise, additionally information hint with warning would be shown
*/
public static boolean showReadOnlyViewWarning(Editor editor) {
public static boolean checkModificationAllowed(Editor editor) {
if (!editor.isViewer()) return true;
if (ApplicationManager.getApplication().isHeadlessEnvironment() || editor instanceof TextComponentEditor) return false;
plugins/gradle/src/org/jetbrains/plugins/gradle/codeInsight/actions/AddGradleDslPluginActionHandler.java
+1 -1
View File
@@ -60,7 +60,7 @@ class AddGradleDslPluginActionHandler implements CodeInsightActionHandler {
@Override
public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
if (!FileModificationService.getInstance().preparePsiElementsForWrite(file)) return;
final JBList list = new JBList(myPlugins);
plugins/gradle/src/org/jetbrains/plugins/gradle/integrations/maven/codeInsight/actions/AddGradleDslDependencyActionHandler.java
+1 -1
View File
@@ -48,7 +48,7 @@ class AddGradleDslDependencyActionHandler implements CodeInsightActionHandler {
@Override
public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor) ||
if (!EditorModificationUtil.checkModificationAllowed(editor) ||
!FileModificationService.getInstance().preparePsiElementsForWrite(file)) return;
final List<MavenId> ids;
plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyImplementMethodsHandler.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class GroovyImplementMethodsHandler implements LanguageCodeInsightActionH
@Override
public void invoke(@NotNull final Project project, @NotNull Editor editor, @NotNull PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
PsiClass aClass = OverrideImplementUtil.getContextClass(project, editor, file, true);
if (aClass instanceof GrTypeDefinition) {
GrTypeDefinition typeDefinition = (GrTypeDefinition)aClass;
plugins/groovy/src/org/jetbrains/plugins/groovy/overrideImplement/GroovyOverrideMethodsHandler.java
+1 -1
View File
@@ -39,7 +39,7 @@ public class GroovyOverrideMethodsHandler implements LanguageCodeInsightActionHa
@Override
public void invoke(@NotNull final Project project, @NotNull Editor editor, @NotNull PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
PsiClass aClass = OverrideImplementUtil.getContextClass(project, editor, file, true);
if (aClass instanceof GrTypeDefinition) {
GrTypeDefinition typeDefinition = (GrTypeDefinition)aClass;
xml/impl/src/com/intellij/xml/actions/GenerateXmlTagAction.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class GenerateXmlTagAction extends SimpleCodeInsightAction {
@Override
public void invoke(@NotNull final Project project, @NotNull final Editor editor, @NotNull final PsiFile file) {
if (!EditorModificationUtil.showReadOnlyViewWarning(editor)) return;
if (!EditorModificationUtil.checkModificationAllowed(editor)) return;
try {
final XmlTag contextTag = getContextTag(editor, file);
if (contextTag == null) {