From be0d8432d6339aacb50ed6d1ab18b051b104b0c8 Mon Sep 17 00:00:00 2001 From: "Maxim.Medvedev" Date: Thu, 26 Jan 2012 15:39:46 +0400 Subject: [PATCH 01/28] Groovy magic: running of static main(args){} --- .../groovy/lang/psi/impl/PsiImplUtil.java | 24 +++++++++++++++++-- .../statements/params/GrParameterImpl.java | 18 ++++++-------- .../typedef/members/GrMethodBaseImpl.java | 4 ++++ 3 files changed, 33 insertions(+), 13 deletions(-) diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java index 46f3230e3e18..9b47c654a40d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/PsiImplUtil.java @@ -65,6 +65,7 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrGdkMethod; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrMethod; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.members.GrReflectedMethod; +import org.jetbrains.plugins.groovy.lang.psi.api.types.GrTypeElement; import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.TypesUtil; import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.arithmetic.GrAdditiveExpressionImpl; import org.jetbrains.plugins.groovy.lang.psi.impl.statements.expressions.arithmetic.GrMultiplicativeExpressionImpl; @@ -441,8 +442,27 @@ public class PsiImplUtil { } public static boolean isMainMethod(GrMethod method) { - return method.getName().equals(MAIN_METHOD) && - method.hasModifierProperty(PsiModifier.STATIC); + if (!method.getName().equals(MAIN_METHOD)) return false; + else if (!method.hasModifierProperty(PsiModifier.STATIC))return false; + + final GrParameter[] parameters = method.getParameters(); + + if (parameters.length == 0) return false; + if (parameters.length == 1 && parameters[0].getTypeElementGroovy() == null) return true; + + int args_count = 0; + int optional_count = 0; + + for (GrParameter p : parameters) { + final GrTypeElement declaredType = p.getTypeElementGroovy(); + if ((declaredType == null || declaredType.getType().equalsToText(CommonClassNames.JAVA_LANG_STRING + "[]")) && + p.getDefaultInitializer() == null) { + args_count++; + } + if (p.getDefaultInitializer() != null) optional_count++; + } + + return optional_count == parameters.length - 1 && args_count == 1; } public static void deleteStatementTail(PsiElement container, @NotNull PsiElement statement) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java index 4a2139b8b7ad..a3a7c786abd9 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/params/GrParameterImpl.java @@ -118,7 +118,7 @@ public class GrParameterImpl extends GrVariableBaseImpl impleme public PsiType getType() { PsiType type = super.getType(); if (isMainMethodFirstUntypedParameter()) { - return TypesUtil.createTypeByFQClassName("java.lang.String", this).createArrayType(); + return TypesUtil.createTypeByFQClassName(CommonClassNames.JAVA_LANG_STRING, this).createArrayType(); } if (getParent() instanceof GrForClause) { //inside for loop final PsiType typeGroovy = getTypeGroovy(); @@ -129,18 +129,14 @@ public class GrParameterImpl extends GrVariableBaseImpl impleme private boolean isMainMethodFirstUntypedParameter() { if (getTypeElementGroovy() != null) return false; + if (!(getParent() instanceof GrParameterList)) return false; + if (getDefaultInitializer() != null) return false; - if (getParent() instanceof GrParameterList) { - GrParameterList parameterList = (GrParameterList)getParent(); - GrParameter[] params = parameterList.getParameters(); - if (params.length != 1 || this != params[0]) return false; + GrParameterList parameterList = (GrParameterList)getParent(); + if (!(parameterList.getParent() instanceof GrMethod)) return false; - if (parameterList.getParent() instanceof GrMethod) { - GrMethod method = (GrMethod)parameterList.getParent(); - return PsiImplUtil.isMainMethod(method); - } - } - return false; + GrMethod method = (GrMethod)parameterList.getParent(); + return PsiImplUtil.isMainMethod(method); } public void setType(@Nullable PsiType type) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java index acb8be0ae21d..03a0052d57a0 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/members/GrMethodBaseImpl.java @@ -236,6 +236,10 @@ public abstract class GrMethodBaseImpl extends GrStubElementBase i @Nullable private PsiType getNominalType() { + if (PsiImplUtil.isMainMethod(this)) { + return PsiType.VOID; + } + final GrTypeElement element = getReturnTypeElementGroovy(); if (element != null) { return element.getType(); From b3a9c990b0cee9918fb64bea26ec35abaf5b1f16 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 26 Jan 2012 16:06:13 +0400 Subject: [PATCH 02/28] Get rid of exists() call on symlink detection --- .../vfs/impl/local/LocalFileSystemBase.java | 4 +- .../openapi/util/io/FileSystemUtil.java | 60 +++++++++++-------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java index 38eeed18a5df..f2ff048a9429 100644 --- a/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java +++ b/platform/platform-impl/src/com/intellij/openapi/vfs/impl/local/LocalFileSystemBase.java @@ -188,6 +188,7 @@ public abstract class LocalFileSystemBase extends LocalFileSystem { return ioFile; } + // todo[r.sh] use NIO2 API after migration to JDK 7 // returns -1 if could not get attributes @MagicConstant(flags = {BA_EXISTS, BA_REGULAR, BA_DIRECTORY, BA_HIDDEN}) private static int getBooleanAttributes(@NotNull File f) { @@ -196,8 +197,7 @@ public abstract class LocalFileSystemBase extends LocalFileSystem { Object flags = JAVA_IO_FILESYSTEM_GET_BOOLEAN_ATTRIBUTES_METHOD.invoke(JAVA_IO_FILESYSTEM, f); return ((Integer)flags).intValue(); } - catch (Exception ignored) { - } + catch (Exception ignored) { } } return -1; } diff --git a/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java index c56c28e89536..337395d0b9bd 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 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. @@ -73,9 +73,9 @@ public class FileSystemUtil { private FileSystemUtil() { } - public static boolean isSymLink(@NotNull final File file) { + public static boolean isSymLink(@NotNull final String path) { try { - return ourMediator != null && file.exists() && ourMediator.isSymLink(file.getAbsolutePath()); + return ourMediator != null && ourMediator.isSymLink(path); } catch (Exception e) { LOG.warn(e); @@ -83,15 +83,15 @@ public class FileSystemUtil { } } - public static boolean isSymLink(@NotNull final String path) { - return isSymLink(new File(path)); + public static boolean isSymLink(@NotNull final File file) { + return isSymLink(file.getAbsolutePath()); } @Nullable - public static String resolveSymLink(@NotNull final File file) { - if (file.exists() && ourMediator != null) { + public static String resolveSymLink(@NotNull final String path) { + if (ourMediator != null) { try { - final String realPath = ourMediator.resolveSymLink(file.getAbsolutePath()); + final String realPath = ourMediator.resolveSymLink(path); if (realPath != null && new File(realPath).exists()) { return realPath; } @@ -104,18 +104,14 @@ public class FileSystemUtil { } @Nullable - public static String resolveSymLink(@NotNull final String path) { - return resolveSymLink(new File(path)); + public static String resolveSymLink(@NotNull final File file) { + return resolveSymLink(file.getAbsolutePath()); } public static int getPermissions(@NotNull final String path) { - return getPermissions(new File(path)); - } - - public static int getPermissions(@NotNull final File file) { - if (file.exists() && SystemInfo.isUnix && ourMediator != null) { + if (SystemInfo.isUnix && ourMediator != null) { try { - return ourMediator.getPermissions(file.getAbsolutePath()); + return ourMediator.getPermissions(path); } catch (Exception e) { LOG.warn(e); @@ -124,14 +120,14 @@ public class FileSystemUtil { return -1; } - public static void setPermissions(@NotNull final String path, final int permissions) { - setPermissions(new File(path), permissions); + public static int getPermissions(@NotNull final File file) { + return getPermissions(file.getAbsolutePath()); } - public static void setPermissions(@NotNull final File file, final int permissions) { - if (file.exists() && SystemInfo.isUnix && ourMediator != null) { + public static void setPermissions(@NotNull final String path, final int permissions) { + if (SystemInfo.isUnix && ourMediator != null) { try { - ourMediator.setPermissions(file.getAbsolutePath(), permissions); + ourMediator.setPermissions(path, permissions); } catch (Exception e) { LOG.warn(e); @@ -139,6 +135,10 @@ public class FileSystemUtil { } } + public static void setPermissions(@NotNull final File file, final int permissions) { + setPermissions(file.getAbsolutePath(), permissions); + } + private interface Mediator { boolean isSymLink(@NotNull String path) throws Exception; @@ -156,20 +156,28 @@ public class FileSystemUtil { private final Method myGetPath; private final Method myIsSymbolicLink; private final Object myLinkOptions; + private final Object myNoFollowLinkOptions; private final Method myGetAttribute; private final Method mySetAttribute; private Jdk7MediatorImpl() throws Exception { myDefaultFileSystem = Class.forName("java.nio.file.FileSystems").getMethod("getDefault").invoke(null); + myGetPath = Class.forName("java.nio.file.FileSystem").getMethod("getPath", String.class, String[].class); myGetPath.setAccessible(true); + final Class pathClass = Class.forName("java.nio.file.Path"); myIsSymbolicLink = Class.forName("java.nio.file.Files").getMethod("isSymbolicLink", pathClass); myIsSymbolicLink.setAccessible(true); - myLinkOptions = Array.newInstance(Class.forName("java.nio.file.LinkOption"), 0); - final Class linkOptClass = myLinkOptions.getClass(); - myGetAttribute = Class.forName("java.nio.file.Files").getMethod("getAttribute", pathClass, String.class, linkOptClass); - mySetAttribute = Class.forName("java.nio.file.Files").getMethod("setAttribute", pathClass, String.class, Object.class, linkOptClass); + + final Class linkOptClass = Class.forName("java.nio.file.LinkOption"); + myLinkOptions = Array.newInstance(linkOptClass, 0); + myNoFollowLinkOptions = Array.newInstance(linkOptClass, 1); + Array.set(myNoFollowLinkOptions, 0, linkOptClass.getField("NOFOLLOW_LINKS").get(null)); + + final Class linkOptArrClass = myLinkOptions.getClass(); + myGetAttribute = Class.forName("java.nio.file.Files").getMethod("getAttribute", pathClass, String.class, linkOptArrClass); + mySetAttribute = Class.forName("java.nio.file.Files").getMethod("setAttribute", pathClass, String.class, Object.class, linkOptArrClass); } @Override @@ -189,7 +197,7 @@ public class FileSystemUtil { @Override public int getPermissions(@NotNull final String path) throws Exception { final Object pathObj = myGetPath.invoke(myDefaultFileSystem, path, ArrayUtil.EMPTY_STRING_ARRAY); - final Object attribute = myGetAttribute.invoke(null, pathObj, POSIX_PERMISSIONS_ATTR, myLinkOptions); + final Object attribute = myGetAttribute.invoke(null, pathObj, POSIX_PERMISSIONS_ATTR, myNoFollowLinkOptions); return decodePermissions(attribute); } From 03cbfea688ea43d533b37b82c49e0b36d1228e5d Mon Sep 17 00:00:00 2001 From: Serega Vasiliev Date: Thu, 26 Jan 2012 11:55:17 +0100 Subject: [PATCH 03/28] supported additional spring configurations (AnnotationConfigApplicationContext), refactored filesets and spring processors --- .../com/intellij/ide/actions/GotoRelatedFileAction.java | 7 +++++-- .../src/com/intellij/util/xml/model/impl/DomModelImpl.java | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java b/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java index e60a8ccc09a7..52134b1f406a 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/GotoRelatedFileAction.java @@ -32,6 +32,8 @@ import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleTextAttributes; import com.intellij.ui.popup.list.ListPopupImpl; import com.intellij.util.Processor; +import com.intellij.util.containers.hash.*; +import com.intellij.util.containers.hash.HashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -39,6 +41,7 @@ import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; import java.util.*; +import java.util.HashMap; import java.util.List; /** @@ -207,7 +210,7 @@ public class GotoRelatedFileAction extends AnAction { } } - List items = new ArrayList(); + Set items = new HashSet (); for (GotoRelatedProvider provider : Extensions.getExtensions(GotoRelatedProvider.EP_NAME)) { items.addAll(provider.getItems(contextElement)); @@ -215,7 +218,7 @@ public class GotoRelatedFileAction extends AnAction { items.addAll(provider.getItems(dataContext)); } } - return items; + return new ArrayList(items); } @Override diff --git a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java index 2551b446df90..a3ef1b3a706c 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/impl/DomModelImpl.java @@ -17,6 +17,7 @@ package com.intellij.util.xml.model.impl; import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiFile; import com.intellij.psi.xml.XmlFile; import com.intellij.util.NullableFunction; import com.intellij.util.containers.ContainerUtil; From b157a3a256724417a7fc25e82169228830702f4e Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Tue, 24 Jan 2012 16:48:53 +0400 Subject: [PATCH 04/28] android: improve "add string resource" intention --- .../messages/AndroidBundle.properties | 10 +- .../android/actions/CreateResourceDialog.form | 2 +- .../actions/CreateXmlResourceDialog.form | 93 +++++++ .../actions/CreateXmlResourceDialog.java | 259 ++++++++++++++++++ .../AndroidAddStringResourceAction.java | 199 +++++++++++--- .../LocalResourceManager.java | 43 +-- .../uipreview/DeviceConfiguratorPanel.java | 2 +- .../android/util/AndroidResourceUtil.java | 39 ++- .../testData/addStringRes/Class10_after.java | 2 +- .../testData/addStringRes/Class11_after.java | 2 +- .../testData/addStringRes/Class12_after.java | 2 +- .../testData/addStringRes/Class13.java | 2 +- .../testData/addStringRes/Class13_after.java | 4 +- .../testData/addStringRes/Class14.java | 2 +- .../testData/addStringRes/Class1_after.java | 2 +- .../testData/addStringRes/Class2_after.java | 2 +- .../testData/addStringRes/Class3_after.java | 2 +- .../testData/addStringRes/Class4_after.java | 2 +- .../testData/addStringRes/Class5_after.java | 2 +- .../testData/addStringRes/Class6_after.java | 2 +- .../testData/addStringRes/Class7_after.java | 2 +- .../android/testData/addStringRes/Class8.java | 2 +- .../testData/addStringRes/Class8_after.java | 4 +- .../android/testData/addStringRes/Class9.java | 2 +- .../testData/addStringRes/Class9_after.java | 4 +- .../addStringRes/ClassEscape_after.java | 2 +- .../AndroidAddStringResourceActionTest.java | 25 +- 27 files changed, 587 insertions(+), 127 deletions(-) create mode 100644 plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.form create mode 100644 plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties index feb398e022a1..2b6ad57b277f 100644 --- a/plugins/android/resources/messages/AndroidBundle.properties +++ b/plugins/android/resources/messages/AndroidBundle.properties @@ -1,6 +1,6 @@ command.0.execution.failed.with.exit.code.1=Command \"{0}\" execution failed with exit code {1} aidl.filetype.description=Android IDL files -add.string.resource.intention.text=Add a string resource +add.string.resource.intention.text=Extract string resource resource.name=Resource name intention.family=Android package.not.found.error=Package is not specified in the manifest file @@ -8,8 +8,8 @@ cannot.resolve.flag.error=Cannot resolve flag cannot.resolve.format.error=Cannot resolve format create.resource.quickfix.name=Create resource {0} in {1} quick.fixes.family=Android Quick Fixes -not.resource.file.error="File {0} is not resource file" -check.resource.dir.error=Check if resource directory exists +not.resource.file.error=File {0} is not resource file +check.resource.dir.error=Cannot find resource directory for module {0} choose.device.dialog.title=Choose Device replace.avd.question=AVD {0} already exists. Replace? create.avd.dialog.title=Create Android Virtual Device @@ -147,6 +147,7 @@ create.run.configuration.title=Create Android Run Configuration file.must.be.under.module.error=Cannot compute relative path for {0} android.extract.package.choose.dest.apk=Choose destination APK file android.cannot.create.file.error=Cannot create file {0} +android.cannot.create.dir.error=Cannot create directory {0} android.manifest.not.found.error=AndroidManifest.xml doesn't exist or has incorrect root tag android.apt.settings.title=AAPT Compiler android.aidl.settings.title=AIDL Compiler @@ -305,4 +306,5 @@ android.facet.settings.custom.debug.keystore.label=C&ustom debug keystore\: android.export.package.run.proguard.label=Run &ProGuard android.export.package.proguad.config.label=C&onfig file path\: android.extract.package.specify.proguard.cfg.path.error=Please specify ProGuard config file path -android.inspections.lint.name=Android Lint Validation \ No newline at end of file +android.inspections.lint.name=Android Lint Validation +android.lint.quickfixes.family=Android Lint Quick Fixes \ No newline at end of file diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form b/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form index efaa03fc30f8..560b404bdd2d 100644 --- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form +++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceDialog.form @@ -3,7 +3,7 @@ - + diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.form b/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.form new file mode 100644 index 000000000000..e259ae3a5dad --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.form @@ -0,0 +1,93 @@ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java b/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java new file mode 100644 index 000000000000..f6797c5924d5 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java @@ -0,0 +1,259 @@ +package org.jetbrains.android.actions; + +import com.android.AndroidConstants; +import com.android.ide.common.resources.configuration.FolderConfiguration; +import com.android.resources.ResourceFolderType; +import com.android.resources.ResourceType; +import com.intellij.CommonBundle; +import com.intellij.ide.ui.ListCellRendererWrapper; +import com.intellij.openapi.fileTypes.StdFileTypes; +import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; +import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.ui.components.JBLabel; +import com.intellij.util.containers.HashSet; +import org.jetbrains.android.dom.resources.ResourceElement; +import org.jetbrains.android.dom.resources.Resources; +import org.jetbrains.android.facet.AndroidFacet; +import org.jetbrains.android.facet.AndroidRootUtil; +import org.jetbrains.android.resourceManagers.ResourceManager; +import org.jetbrains.android.uipreview.DeviceConfiguratorPanel; +import org.jetbrains.android.uipreview.InvalidOptionValueException; +import org.jetbrains.android.util.AndroidResourceUtil; +import org.jetbrains.android.util.AndroidUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.*; +import java.awt.*; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Set; + +/** + * @author Eugene.Kudelevsky + */ +public class CreateXmlResourceDialog extends DialogWrapper { + private JPanel myPanel; + private JPanel myDeviceConfigurationWrapper; + private JTextField myNameField; + private JComboBox myModuleCombo; + private JBLabel myModuleLabel; + private JTextField myDirectoryNameField; + private JBLabel myErrorLabel; + private JTextField myFileNameField; + + private final DeviceConfiguratorPanel myDeviceConfiguratorPanel; + private final Module myModule; + private final ResourceType myResourceType; + + public CreateXmlResourceDialog(@NotNull Module module, @NotNull ResourceType resourceType) { + super(module.getProject()); + + myResourceType = resourceType; + + final Set modulesSet = new HashSet(); + modulesSet.add(module); + + for (AndroidFacet depFacet : AndroidUtils.getAllAndroidDependencies(module, true)) { + modulesSet.add(depFacet.getModule()); + } + + assert modulesSet.size() > 0; + + if (modulesSet.size() == 1) { + myModule = module; + myModuleLabel.setVisible(false); + myModuleCombo.setVisible(false); + } + else { + myModule = null; + + final Module[] modules = modulesSet.toArray(new Module[modulesSet.size()]); + Arrays.sort(modules, new Comparator() { + @Override + public int compare(Module m1, Module m2) { + return m1.getName().compareTo(m2.getName()); + } + }); + + myModuleCombo.setModel(new DefaultComboBoxModel(modules)); + myModuleCombo.setSelectedItem(module); + + myModuleCombo.setRenderer(new ListCellRendererWrapper(myModuleCombo.getRenderer()) { + @Override + public void customize(JList list, Module module, int index, boolean selected, boolean hasFocus) { + setText(module.getName()); + setIcon(ModuleType.get(module).getNodeIcon(false)); + } + }); + } + + myDeviceConfiguratorPanel = new DeviceConfiguratorPanel(null) { + @Override + public void applyEditors() { + try { + doApplyEditors(); + + final FolderConfiguration config = myDeviceConfiguratorPanel.getConfiguration(); + myErrorLabel.setText(""); + myDirectoryNameField.setText(config.getFolderName(ResourceFolderType.VALUES)); + } + catch (InvalidOptionValueException e) { + myErrorLabel.setText("" + e.getMessage() + ""); + myDirectoryNameField.setText(AndroidConstants.FD_RES_VALUES); + } + } + }; + myDeviceConfigurationWrapper.add(myDeviceConfiguratorPanel, BorderLayout.CENTER); + + final String defaultResFileName = ResourceManager.getDefaultResourceFileName(resourceType.getName()); + if (defaultResFileName != null) { + myFileNameField.setText(defaultResFileName); + } + myDirectoryNameField.setText(AndroidConstants.FD_RES_VALUES); + myDeviceConfiguratorPanel.updateAll(); + + init(); + } + + @Override + protected ValidationInfo doValidate() { + final String resourceName = getResourceName(); + final Module selectedModule = getModule(); + final String directoryName = getDirectoryName(); + final String fileName = getFileName(); + + if (resourceName.length() == 0) { + return new ValidationInfo("specify resource name", myNameField); + } + else if (!AndroidResourceUtil.isCorrectAndroidResourceName(resourceName)) { + return new ValidationInfo(resourceName + " is not correct resource name", myNameField); + } + else if (fileName.length() == 0) { + return new ValidationInfo("specify file name", myFileNameField); + } + else if (selectedModule == null) { + return new ValidationInfo("specify module", myModuleCombo); + } + else if (!ResourceFolderType.VALUES.getName().equals( + ResourceManager.getResourceTypeByDirName(directoryName))) { + return new ValidationInfo("directory name is not appropriate for value resources"); + } + + final ValidationInfo info = checkIfResourceAlreadyExists(selectedModule, resourceName, myResourceType, directoryName, fileName); + if (info != null) { + return info; + } + + try { + myDeviceConfiguratorPanel.doApplyEditors(); + } + catch (InvalidOptionValueException e) { + return new ValidationInfo("fix errors in configuration editor"); + } + + return null; + } + + @Nullable + private static ValidationInfo checkIfResourceAlreadyExists(@NotNull Module selectedModule, + @NotNull String resourceName, + @NotNull ResourceType resourceType, + @NotNull String directoryName, + @NotNull String fileName) { + if (resourceName.length() == 0 || + directoryName.length() == 0 || + fileName.length() == 0) { + return null; + } + + final VirtualFile resourceDir = AndroidRootUtil.getResourceDir(selectedModule); + if (resourceDir == null) { + return null; + } + + final VirtualFile resourceSubdir = resourceDir.findChild(directoryName); + if (resourceSubdir == null) { + return null; + } + + final VirtualFile resFile = resourceSubdir.findChild(fileName); + if (resFile == null || resFile.getFileType() != StdFileTypes.XML) { + return null; + } + + final Resources resources = AndroidUtils.loadDomElement(selectedModule, resFile, Resources.class); + if (resources == null) { + return null; + } + + for (ResourceElement element : ResourceManager.getValueResources(resourceType.getName(), resources)) { + if (resourceName.equals(element.getName().getValue())) { + return new ValidationInfo("resource '" + resourceName + "' already exists in " + FileUtil.toSystemDependentName( + resFile.getPath())); + } + } + return null; + } + + @Override + public JComponent getPreferredFocusedComponent() { + return myNameField; + } + + @Override + protected void doOKAction() { + final String resourceName = getResourceName(); + final String fileName = getFileName(); + final String dirName = getDirectoryName(); + final Module module = getModule(); + + if (resourceName.length() == 0) { + Messages.showErrorDialog(myPanel, "Resource name is not specified", CommonBundle.getErrorTitle()); + } + else if (!AndroidResourceUtil.isCorrectAndroidResourceName(resourceName)) { + Messages.showErrorDialog(myPanel, resourceName + " is not correct resource name", CommonBundle.getErrorTitle()); + } + else if (fileName.length() == 0) { + Messages.showErrorDialog(myPanel, "File name is not specified", CommonBundle.getErrorTitle()); + } + else if (dirName.length() == 0) { + Messages.showErrorDialog(myPanel, "Directory name is not specified", CommonBundle.getErrorTitle()); + } + else if (module == null) { + Messages.showErrorDialog(myPanel, "Module is not specified", CommonBundle.getErrorTitle()); + } + else { + super.doOKAction(); + } + } + + @NotNull + public String getResourceName() { + return myNameField.getText().trim(); + } + + @NotNull + public String getDirectoryName() { + return myDirectoryNameField.getText().trim(); + } + + @NotNull + public String getFileName() { + return myFileNameField.getText().trim(); + } + + @Nullable + public Module getModule() { + return myModule != null ? myModule : (Module)myModuleCombo.getSelectedItem(); + } + + @Override + protected JComponent createCenterPanel() { + return myPanel; + } +} diff --git a/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java b/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java index 9826b6d9aabe..9b5a38e630ff 100644 --- a/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java +++ b/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java @@ -16,6 +16,7 @@ package org.jetbrains.android.intentions; +import com.android.resources.ResourceType; import com.intellij.CommonBundle; import com.intellij.codeInsight.intention.AbstractIntentionAction; import com.intellij.codeInsight.lookup.LookupElement; @@ -23,35 +24,40 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.codeInsight.template.*; import com.intellij.codeInsight.template.impl.*; import com.intellij.codeInsight.template.macro.VariableOfTypeMacro; +import com.intellij.ide.actions.CreateElementActionBase; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.undo.UndoUtil; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.RangeMarker; +import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.InputValidatorEx; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.TextRange; -import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.android.AndroidFileTemplateProvider; +import org.jetbrains.android.actions.CreateXmlResourceDialog; import org.jetbrains.android.dom.manifest.Manifest; import org.jetbrains.android.dom.resources.ResourceElement; +import org.jetbrains.android.dom.resources.Resources; import org.jetbrains.android.facet.AndroidFacet; -import org.jetbrains.android.resourceManagers.LocalResourceManager; import org.jetbrains.android.util.AndroidBundle; import org.jetbrains.android.util.AndroidResourceUtil; import org.jetbrains.android.util.AndroidUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.io.File; import java.util.LinkedHashSet; import java.util.Set; -import static com.intellij.openapi.ui.Messages.showInputDialog; import static org.jetbrains.android.util.AndroidUtils.VIEW_CLASS_NAME; /** @@ -62,6 +68,8 @@ import static org.jetbrains.android.util.AndroidUtils.VIEW_CLASS_NAME; * To change this template use File | Settings | File Templates. */ public class AndroidAddStringResourceAction extends AbstractIntentionAction { + private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.intentions.AndroidAddStringResourceAction"); + private static final String CONTEXT = AndroidUtils.ANDROID_PACKAGE + ".content.Context"; private static final String RESOURCES = AndroidUtils.ANDROID_PACKAGE + ".content.res.Resources"; @@ -124,50 +132,56 @@ public class AndroidAddStringResourceAction extends AbstractIntentionAction { } static void doInvoke(Project project, Editor editor, PsiFile file, @Nullable String resName) { - AndroidFacet facet = AndroidFacet.getInstance(file); + final AndroidFacet facet = AndroidFacet.getInstance(file); assert facet != null; - PsiElement element = getPsiElement(file, editor); + + final PsiElement element = getPsiElement(file, editor); assert element != null; + String value = getStringLiteralValue(element, file); assert value != null; value = value.replace("'", "\\'").replace("\"", "\\\""); - String aPackage = getPackage(facet); + + final String aPackage = getPackage(facet); if (aPackage == null) { Messages.showErrorDialog(project, AndroidBundle.message("package.not.found.error"), CommonBundle.getErrorTitle()); return; } + if (resName == null) { - resName = - showInputDialog(project, AndroidBundle.message("resource.name"), AndroidBundle.message("add.string.resource.intention.text"), - Messages.getQuestionIcon(), "", new InputValidatorEx() { - public String getErrorText(String inputString) { - if (inputString == null || inputString.length() == 0) return null; - String[] ids = inputString.split("."); - for (String id : ids) { - if (!StringUtil.isJavaIdentifier(id)) { - return AndroidBundle.message("android.identifier.expected", id); - } - } - return null; - } + final CreateXmlResourceDialog dialog = new CreateXmlResourceDialog(facet.getModule(), ResourceType.STRING); + dialog.setTitle("Extract String Resource"); + dialog.show(); + + if (!dialog.isOK()) { + return; + } - public boolean checkInput(String inputString) { - return inputString != null && AndroidResourceUtil.isCorrectAndroidResourceName(inputString); - } + final Module module = dialog.getModule(); + if (module == null) { + return; + } - public boolean canClose(String inputString) { - return checkInput(inputString); - } - }); + final ResourceElement createdElement = + doCreate(module, dialog.getResourceName(), ResourceType.STRING, dialog.getFileName(), dialog.getDirectoryName(), value); + + if (createdElement != null) { + resName = createdElement.getName().getValue(); + } } - if (resName == null) return; - LocalResourceManager manager = facet.getLocalResourceManager(); - String resType = "string"; - ResourceElement resElement = manager.addValueResource(resType, resName, value); - assert resElement != null; - createJavaResourceReference(project, editor, file, element, aPackage, resName, resType); + else { + assert ApplicationManager.getApplication().isUnitTestMode(); + doCreate(facet.getModule(), resName, ResourceType.STRING, "strings.xml", "values", value); + } + + if (resName == null) { + return; + } + + createJavaResourceReference(project, editor, file, element, aPackage, resName, ResourceType.STRING.getName()); PsiDocumentManager.getInstance(project).commitAllDocuments(); UndoUtil.markPsiFileForUndo(file); + ApplicationManager.getApplication().invokeLater(new Runnable() { public void run() { ApplicationManager.getApplication().saveAll(); @@ -188,14 +202,25 @@ public class AndroidAddStringResourceAction extends AbstractIntentionAction { assert methodName != null; final TemplateImpl template; final boolean inStaticContext = RefactoringUtil.isInStaticContext(element, null); + if (extendsContext && !inStaticContext) { - template = new TemplateImpl("", "$resources$." + methodName + "(" + field + ")", ""); - MacroCallNode node = new MacroCallNode(new MyVarOfTypeExpression("getResources()")); - node.addParameter(new ConstantNode(RESOURCES)); - template.addVariable("resources", node, new ConstantNode(""), true); + if (ResourceType.STRING.getName().equals(resType)) { + template = new TemplateImpl("", methodName + '(' + field + ')', ""); + } + else { + template = new TemplateImpl("", "$resources$." + methodName + "(" + field + ")", ""); + MacroCallNode node = new MacroCallNode(new MyVarOfTypeExpression("getResources()")); + node.addParameter(new ConstantNode(RESOURCES)); + template.addVariable("resources", node, new ConstantNode(""), true); + } } else { - template = new TemplateImpl("", "$context$.getResources()." + methodName + "(" + field + ")", ""); + if (ResourceType.STRING.getName().equals(resType)) { + template = new TemplateImpl("", "$context$." + methodName + "(" + field + ")", ""); + } + else { + template = new TemplateImpl("", "$context$.getResources()." + methodName + "(" + field + ")", ""); + } final boolean extendsView = getContainingInheritorOf(element, VIEW_CLASS_NAME) != null; MacroCallNode node = new MacroCallNode(extendsView && !inStaticContext ? new MyVarOfTypeExpression("getContext()") : new VariableOfTypeMacro()); @@ -242,6 +267,104 @@ public class AndroidAddStringResourceAction extends AbstractIntentionAction { return true; } + @Nullable + private static ResourceElement doCreate(@NotNull Module module, + @NotNull String resourceName, + @NotNull ResourceType resourceType, + @NotNull String fileName, + @NotNull String dirName, + @NotNull String value) { + final Project project = module.getProject(); + final AndroidFacet facet = AndroidFacet.getInstance(module); + assert facet != null; + + try { + return addValueResource(facet, resourceName, resourceType, fileName, dirName, value); + } + catch (Exception e) { + final String message = CreateElementActionBase.filterMessage(e.getMessage()); + + if (message == null || message.length() == 0) { + LOG.error(e); + } + else { + LOG.info(e); + reportError(project, message); + } + return null; + } + } + + @Nullable + public static ResourceElement addValueResource(@NotNull AndroidFacet facet, + @NotNull String resourceName, + @NotNull ResourceType resourceType, + @NotNull String fileName, + @NotNull String dirName, + @NotNull String value) throws Exception { + final VirtualFile resFile = findOrCreateResourceFile(facet, fileName, dirName); + if (resFile == null) { + return null; + } + + final Resources resources = AndroidUtils.loadDomElement(facet.getModule(), resFile, Resources.class); + if (resources == null) { + reportError(facet.getModule().getProject(), AndroidBundle.message("not.resource.file.error", fileName)); + return null; + } + + final ResourceElement element = AndroidResourceUtil.addValueResource(resourceType.getName(), resources); + element.getName().setValue(resourceName); + + if (value.length() > 0) { + element.setStringValue(value); + } + return element; + } + + @Nullable + private static VirtualFile findOrCreateResourceFile(@NotNull AndroidFacet facet, + @NotNull final String fileName, + @NotNull String dirName) throws Exception { + final Module module = facet.getModule(); + final Project project = module.getProject(); + final VirtualFile resDir = facet.getLocalResourceManager().getResourceDir(); + + if (resDir == null) { + reportError(project, AndroidBundle.message("check.resource.dir.error", module.getName())); + return null; + } + final VirtualFile dir = AndroidUtils.createChildDirectoryIfNotExist(project, resDir, dirName); + final String dirPath = FileUtil.toSystemDependentName(resDir.getPath() + '/' + dirName); + + if (dir == null) { + reportError(project, AndroidBundle.message("android.cannot.create.dir.error", dirPath)); + return null; + } + + final VirtualFile file = dir.findChild(fileName); + if (file != null) { + return file; + } + + AndroidFileTemplateProvider + .createFromTemplate(project, dir, AndroidFileTemplateProvider.VALUE_RESOURCE_FILE_TEMPLATE, fileName); + final VirtualFile result = dir.findChild(fileName); + if (result == null) { + reportError(project, AndroidBundle.message("android.cannot.create.file.error", dirPath + File.separatorChar + fileName)); + } + return result; + } + + private static void reportError(@NotNull Project project, @NotNull String message) { + if (ApplicationManager.getApplication().isUnitTestMode()) { + throw new IncorrectOperationException(message); + } + else { + Messages.showErrorDialog(project, message, CommonBundle.getErrorTitle()); + } + } + private static class MyVarOfTypeExpression extends VariableOfTypeMacro { private final String myDefaultValue; diff --git a/plugins/android/src/org/jetbrains/android/resourceManagers/LocalResourceManager.java b/plugins/android/src/org/jetbrains/android/resourceManagers/LocalResourceManager.java index fc34714eefeb..3722ec9a371b 100644 --- a/plugins/android/src/org/jetbrains/android/resourceManagers/LocalResourceManager.java +++ b/plugins/android/src/org/jetbrains/android/resourceManagers/LocalResourceManager.java @@ -208,7 +208,8 @@ public class LocalResourceManager extends ResourceManager { private VirtualFile findOrCreateResourceFile(@NotNull final String fileName) { VirtualFile dir = getResourceDir(); if (dir == null) { - Messages.showErrorDialog(myModule.getProject(), AndroidBundle.message("check.resource.dir.error"), CommonBundle.getErrorTitle()); + Messages.showErrorDialog(myModule.getProject(), AndroidBundle.message("check.resource.dir.error", myModule.getName()), + CommonBundle.getErrorTitle()); return null; } final VirtualFile valuesDir = findOrCreateChildDir(dir, AndroidConstants.FD_RES_VALUES); @@ -240,7 +241,8 @@ public class LocalResourceManager extends ResourceManager { VirtualFile resDir = getResourceDir(); Project project = myModule.getProject(); if (resDir == null) { - Messages.showErrorDialog(project, AndroidBundle.message("check.resource.dir.error"), CommonBundle.getErrorTitle()); + Messages + .showErrorDialog(project, AndroidBundle.message("check.resource.dir.error", myModule.getName()), CommonBundle.getErrorTitle()); return null; } PsiElement[] createdElements = CreateResourceFileAction.createResourceFile(project, resDir, resType, fileOrResourceName); @@ -269,7 +271,7 @@ public class LocalResourceManager extends ResourceManager { CommonBundle.getErrorTitle()); return null; } - ResourceElement element = addValueResource(type, resources); + ResourceElement element = AndroidResourceUtil.addValueResource(type, resources); element.getName().setValue(name); if (value != null) { element.setStringValue(value); @@ -277,41 +279,6 @@ public class LocalResourceManager extends ResourceManager { return element; } - @NotNull - private static ResourceElement addValueResource(@NotNull final String type, @NotNull final Resources resources) { - if (type.equals("string")) { - return resources.addString(); - } - else if (type.equals("dimen")) { - return resources.addDimen(); - } - else if (type.equals("color")) { - return resources.addColor(); - } - else if (type.equals("drawable")) { - return resources.addDrawable(); - } - else if (type.equals("style")) { - return resources.addStyle(); - } - else if (type.equals("array")) { - // todo: choose among string-array, integer-array and array - return resources.addStringArray(); - } - else if (type.equals("integer")) { - return resources.addInteger(); - } - else if (type.equals("bool")) { - return resources.addBool(); - } - else if (type.equals("id")) { - Item item = resources.addItem(); - item.getType().setValue("id"); - return item; - } - throw new IllegalArgumentException("Incorrect resource type"); - } - @Nullable private VirtualFile findOrCreateChildDir(@NotNull final VirtualFile dir, @NotNull final String name) { try { diff --git a/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java b/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java index 19738d60d394..ebb4303166f4 100644 --- a/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java +++ b/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java @@ -252,7 +252,7 @@ public abstract class DeviceConfiguratorPanel extends JPanel { applyEditors(); } - protected void doApplyEditors() throws InvalidOptionValueException { + public void doApplyEditors() throws InvalidOptionValueException { try { final FolderConfiguration newConfig = new FolderConfiguration(); diff --git a/plugins/android/src/org/jetbrains/android/util/AndroidResourceUtil.java b/plugins/android/src/org/jetbrains/android/util/AndroidResourceUtil.java index b3c0a380d7a8..4d95bb5dc5b1 100644 --- a/plugins/android/src/org/jetbrains/android/util/AndroidResourceUtil.java +++ b/plugins/android/src/org/jetbrains/android/util/AndroidResourceUtil.java @@ -35,9 +35,7 @@ import com.intellij.util.containers.HashSet; import com.intellij.util.indexing.FileBasedIndex; import org.jetbrains.android.AndroidIdIndex; import org.jetbrains.android.dom.manifest.Manifest; -import org.jetbrains.android.dom.resources.Attr; -import org.jetbrains.android.dom.resources.DeclareStyleable; -import org.jetbrains.android.dom.resources.ResourceElement; +import org.jetbrains.android.dom.resources.*; import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.android.resourceManagers.LocalResourceManager; import org.jetbrains.android.resourceManagers.ResourceManager; @@ -402,4 +400,39 @@ public class AndroidResourceUtil { List targets = findResourcesByField(manager, resField); return PsiUtilBase.toPsiElementArray(targets); } + + @NotNull + public static ResourceElement addValueResource(@NotNull final String type, @NotNull final Resources resources) { + if (type.equals("string")) { + return resources.addString(); + } + else if (type.equals("dimen")) { + return resources.addDimen(); + } + else if (type.equals("color")) { + return resources.addColor(); + } + else if (type.equals("drawable")) { + return resources.addDrawable(); + } + else if (type.equals("style")) { + return resources.addStyle(); + } + else if (type.equals("array")) { + // todo: choose among string-array, integer-array and array + return resources.addStringArray(); + } + else if (type.equals("integer")) { + return resources.addInteger(); + } + else if (type.equals("bool")) { + return resources.addBool(); + } + else if (type.equals("id")) { + Item item = resources.addItem(); + item.getType().setValue("id"); + return item; + } + throw new IllegalArgumentException("Incorrect resource type"); + } } diff --git a/plugins/android/testData/addStringRes/Class10_after.java b/plugins/android/testData/addStringRes/Class10_after.java index f4fa6807e3f1..baf3c102a5e4 100644 --- a/plugins/android/testData/addStringRes/Class10_after.java +++ b/plugins/android/testData/addStringRes/Class10_after.java @@ -6,6 +6,6 @@ import p1.p2.R; public class Class extends View { public static void f(Context context) { - String s = context.getResources().getString(R.string.hello); + String s = context.getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class11_after.java b/plugins/android/testData/addStringRes/Class11_after.java index 8b6382d95d97..9382074c0fb6 100644 --- a/plugins/android/testData/addStringRes/Class11_after.java +++ b/plugins/android/testData/addStringRes/Class11_after.java @@ -6,6 +6,6 @@ import p1.p2.R; public class Class extends View { public void f(Context context) { - String s = context.getResources().getString(R.string.hello); + String s = context.getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class12_after.java b/plugins/android/testData/addStringRes/Class12_after.java index 83e438df6bc1..7e60cc7a2b4e 100644 --- a/plugins/android/testData/addStringRes/Class12_after.java +++ b/plugins/android/testData/addStringRes/Class12_after.java @@ -6,6 +6,6 @@ import p1.p2.R; public class Class extends View { public void f() { - String s = getContext().getResources().getString(R.string.hello); + String s = getContext().getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class13.java b/plugins/android/testData/addStringRes/Class13.java index 88386f469397..9e041435687c 100644 --- a/plugins/android/testData/addStringRes/Class13.java +++ b/plugins/android/testData/addStringRes/Class13.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.res.Resources; public class Class extends Context { - public void f(Resources resources) { + public void f(Context resources) { String s = "hello"; } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class13_after.java b/plugins/android/testData/addStringRes/Class13_after.java index 5ec2a470edd8..09500911aac2 100644 --- a/plugins/android/testData/addStringRes/Class13_after.java +++ b/plugins/android/testData/addStringRes/Class13_after.java @@ -5,7 +5,7 @@ import android.content.res.Resources; import p1.p2.R; public class Class extends Context { - public void f(Resources resources) { - String s = resources.getString(R.string.hello); + public void f(Context resources) { + String s = getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class14.java b/plugins/android/testData/addStringRes/Class14.java index a878406b7b5e..712cfb75b390 100644 --- a/plugins/android/testData/addStringRes/Class14.java +++ b/plugins/android/testData/addStringRes/Class14.java @@ -4,7 +4,7 @@ import android.content.Context; import android.content.res.Resources; public class Class extends Context { - public void f(Resources resources) { + public void f(Context resources) { String s = "hello"; } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class1_after.java b/plugins/android/testData/addStringRes/Class1_after.java index 9ff6724619a7..97da0a51a00a 100644 --- a/plugins/android/testData/addStringRes/Class1_after.java +++ b/plugins/android/testData/addStringRes/Class1_after.java @@ -5,6 +5,6 @@ import p1.p2.R; public class Class { public void f(Context context) { - String s = context.getResources().getString(R.string.hello); + String s = context.getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class2_after.java b/plugins/android/testData/addStringRes/Class2_after.java index 9d15d2e96123..ed96dfac98e1 100644 --- a/plugins/android/testData/addStringRes/Class2_after.java +++ b/plugins/android/testData/addStringRes/Class2_after.java @@ -4,6 +4,6 @@ import p1.p2.R; public class Class { public void f() { - String s = .getResources().getString(R.string.hello); + String s = .getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class3_after.java b/plugins/android/testData/addStringRes/Class3_after.java index 91ccbec6b974..e673d41f2bc3 100644 --- a/plugins/android/testData/addStringRes/Class3_after.java +++ b/plugins/android/testData/addStringRes/Class3_after.java @@ -4,6 +4,6 @@ import android.content.Context; public class Class { public static void f(Context context) { - String s = context.getResources().getString(R.string.hello); + String s = context.getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class4_after.java b/plugins/android/testData/addStringRes/Class4_after.java index 9103cc7e9188..bd29df958460 100644 --- a/plugins/android/testData/addStringRes/Class4_after.java +++ b/plugins/android/testData/addStringRes/Class4_after.java @@ -5,6 +5,6 @@ import p1.p2.R; public class Class extends Context { public void f() { - String s = getResources().getString(R.string.hello); + String s = getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class5_after.java b/plugins/android/testData/addStringRes/Class5_after.java index 1e236c780eb5..da79fab7bb17 100644 --- a/plugins/android/testData/addStringRes/Class5_after.java +++ b/plugins/android/testData/addStringRes/Class5_after.java @@ -5,6 +5,6 @@ import p1.p2.R; public class Class extends Context { public void f(Context context) { - String s = r.getString(R.string.hello); + String s = getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class6_after.java b/plugins/android/testData/addStringRes/Class6_after.java index b7c6406839cb..a93565254d49 100644 --- a/plugins/android/testData/addStringRes/Class6_after.java +++ b/plugins/android/testData/addStringRes/Class6_after.java @@ -4,6 +4,6 @@ import android.content.Context; public class Class extends Context { public static void f(Context context) { - String s = context.getResources().getString(R.string.hello); + String s = context.getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class7_after.java b/plugins/android/testData/addStringRes/Class7_after.java index e86ce36b99d8..00b2c250ff40 100644 --- a/plugins/android/testData/addStringRes/Class7_after.java +++ b/plugins/android/testData/addStringRes/Class7_after.java @@ -5,6 +5,6 @@ import p1.p2.R; public class Class extends Context { public static void f() { - String s = c.getResources().getString(R.string.hello); + String s = c.getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class8.java b/plugins/android/testData/addStringRes/Class8.java index 693f55baf78e..6fc5467ab4e8 100644 --- a/plugins/android/testData/addStringRes/Class8.java +++ b/plugins/android/testData/addStringRes/Class8.java @@ -4,7 +4,7 @@ import android.content.res.Resources; import android.content.Context; public class Class extends Context { - public static void f(Resources resources) { + public static void f(Context resources) { String s = "hello"; } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class8_after.java b/plugins/android/testData/addStringRes/Class8_after.java index 2e14b4212485..f6f6d1ce2364 100644 --- a/plugins/android/testData/addStringRes/Class8_after.java +++ b/plugins/android/testData/addStringRes/Class8_after.java @@ -4,7 +4,7 @@ import android.content.res.Resources; import android.content.Context; public class Class extends Context { - public static void f(Resources resources) { - String s = .getResources().getString(R.string.hello); + public static void f(Context resources) { + String s = resources.getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class9.java b/plugins/android/testData/addStringRes/Class9.java index 1e6f044c4f45..47817692eb10 100644 --- a/plugins/android/testData/addStringRes/Class9.java +++ b/plugins/android/testData/addStringRes/Class9.java @@ -4,7 +4,7 @@ import android.content.res.Resources; import android.content.Context; public class Class extends Context { - public void f(Resources resources) { + public void f(Context context) { String s = "hello"; } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/Class9_after.java b/plugins/android/testData/addStringRes/Class9_after.java index 11dd486a73cd..f5529bd3b025 100644 --- a/plugins/android/testData/addStringRes/Class9_after.java +++ b/plugins/android/testData/addStringRes/Class9_after.java @@ -4,7 +4,7 @@ import android.content.res.Resources; import android.content.Context; public class Class extends Context { - public void f(Resources resources) { - String s = getResources().getString(R.string.hello); + public void f(Context context) { + String s = getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/ClassEscape_after.java b/plugins/android/testData/addStringRes/ClassEscape_after.java index 0658a8a53f82..f92cf49160a9 100644 --- a/plugins/android/testData/addStringRes/ClassEscape_after.java +++ b/plugins/android/testData/addStringRes/ClassEscape_after.java @@ -4,6 +4,6 @@ import android.content.Context; public class ClassEscape { public static void f(Context context) { - String s = context.getResources().getString(R.string.hello); + String s = context.getString(R.string.hello); } } \ No newline at end of file diff --git a/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java b/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java index b58ff1cd2633..462010c04dfc 100644 --- a/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java +++ b/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java @@ -46,13 +46,7 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { } public void test5() { - doTest(new Runnable() { - @Override - public void run() { - myFixture.type('r'); - TemplateManagerImpl.getTemplateState(myFixture.getEditor()).nextTab(); - } - }); + doTest(); } public void test6() { @@ -70,12 +64,7 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { } public void test8() { - doTest(new Runnable() { - @Override - public void run() { - myFixture.performEditorAction(IdeActions.ACTION_CHOOSE_LOOKUP_ITEM); - } - }); + doTest(); } public void test9() { @@ -101,13 +90,7 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { } public void test13() { - doTest(new Runnable() { - @Override - public void run() { - myFixture.type("r"); - myFixture.performEditorAction(IdeActions.ACTION_CHOOSE_LOOKUP_ITEM); - } - }); + doTest(); } public void test14() { @@ -132,7 +115,7 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { } catch (IncorrectOperationException e) { // in normal mode error dialog will be shown - assertEquals("invalid strings.xml", e.getMessage()); + assertEquals("File strings.xml is not resource file", e.getMessage()); } myFixture.checkResultByFile(BASE_PATH + "Class1.java"); myFixture.checkResultByFile("res/values/strings.xml", BASE_PATH + "strings_invalid.xml", false); From ef2de85e81211d4543144e79a34a8a229a5b4e8b Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Tue, 24 Jan 2012 17:35:53 +0400 Subject: [PATCH 05/28] IDEA-63248 android: "extract string resource" intention should work in layout xml files --- .../AndroidAddStringResourceAction.java | 18 +++++++++++++++++- .../testData/addStringRes/fromLayout.xml | 11 +++++++++++ .../testData/addStringRes/fromLayout_after.xml | 11 +++++++++++ .../AndroidAddStringResourceActionTest.java | 18 ++++++++++++++++-- 4 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 plugins/android/testData/addStringRes/fromLayout.xml create mode 100644 plugins/android/testData/addStringRes/fromLayout_after.xml diff --git a/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java b/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java index 9b5a38e630ff..0715cfc35f90 100644 --- a/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java +++ b/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java @@ -40,12 +40,16 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlAttribute; +import com.intellij.psi.xml.XmlAttributeValue; +import com.intellij.psi.xml.XmlFile; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.android.AndroidFileTemplateProvider; import org.jetbrains.android.actions.CreateXmlResourceDialog; import org.jetbrains.android.dom.manifest.Manifest; import org.jetbrains.android.dom.resources.ResourceElement; +import org.jetbrains.android.dom.resources.ResourceValue; import org.jetbrains.android.dom.resources.Resources; import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.android.util.AndroidBundle; @@ -102,6 +106,9 @@ public class AndroidAddStringResourceAction extends AbstractIntentionAction { return (String)value; } } + else if (file instanceof XmlFile && element instanceof XmlAttributeValue) { + return ((XmlAttributeValue)element).getValue(); + } return null; } @@ -178,7 +185,16 @@ public class AndroidAddStringResourceAction extends AbstractIntentionAction { return; } - createJavaResourceReference(project, editor, file, element, aPackage, resName, ResourceType.STRING.getName()); + if (file instanceof PsiJavaFile) { + createJavaResourceReference(project, editor, file, element, aPackage, resName, ResourceType.STRING.getName()); + } + else { + final XmlAttribute attribute = PsiTreeUtil.getParentOfType(element, XmlAttribute.class); + if (attribute != null) { + attribute.setValue(ResourceValue.referenceTo('@', null, ResourceType.STRING.getName(), resName).toString()); + } + } + PsiDocumentManager.getInstance(project).commitAllDocuments(); UndoUtil.markPsiFileForUndo(file); diff --git a/plugins/android/testData/addStringRes/fromLayout.xml b/plugins/android/testData/addStringRes/fromLayout.xml new file mode 100644 index 000000000000..1b496cc10ad8 --- /dev/null +++ b/plugins/android/testData/addStringRes/fromLayout.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/fromLayout_after.xml b/plugins/android/testData/addStringRes/fromLayout_after.xml new file mode 100644 index 000000000000..c074c981ecad --- /dev/null +++ b/plugins/android/testData/addStringRes/fromLayout_after.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java b/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java index 462010c04dfc..5ccbde1c42bf 100644 --- a/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java +++ b/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java @@ -121,6 +121,12 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { myFixture.checkResultByFile("res/values/strings.xml", BASE_PATH + "strings_invalid.xml", false); } + public void testFromLayout() { + final VirtualFile javaFile = myFixture.copyFileToProject(BASE_PATH + getTestName(false) + ".xml", "res/layout/layout.xml"); + doExtractAndCheckStringsXml("strings.xml", null, true, "strings_after.xml", javaFile); + myFixture.checkResultByFile(BASE_PATH + getTestName(false) + "_after.xml"); + } + private void doTest() { doTest(getTestName(false), "strings.xml", null, true); } @@ -138,11 +144,20 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { @Nullable final Runnable invokeAfterTemplate, final boolean closePopup, String stringsAfter) { + VirtualFile javaFile = myFixture.copyFileToProject(BASE_PATH + "Class" + testName + ".java", "src/p1/p2/Class.java"); + doExtractAndCheckStringsXml(stringsXml, invokeAfterTemplate, closePopup, stringsAfter, javaFile); + myFixture.checkResultByFile(BASE_PATH + "Class" + testName + "_after.java"); + } + + private void doExtractAndCheckStringsXml(String stringsXml, + final Runnable invokeAfterTemplate, + final boolean closePopup, + String stringsAfter, + VirtualFile javaFile) { if (stringsXml != null) { myFixture.copyFileToProject(BASE_PATH + stringsXml, "res/values/strings.xml"); } myFixture.copyFileToProject(BASE_PATH + "R.java", "src/p1/p2/R.java"); - VirtualFile javaFile = myFixture.copyFileToProject(BASE_PATH + "Class" + testName + ".java", "src/p1/p2/Class.java"); myFixture.configureFromExistingVirtualFile(javaFile); final PsiFile javaPsiFile = myFixture.getFile(); assertTrue(new AndroidAddStringResourceAction().isAvailable(myFixture.getProject(), myFixture.getEditor(), javaPsiFile)); @@ -163,7 +178,6 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { } } }, "", ""); - myFixture.checkResultByFile(BASE_PATH + "Class" + testName + "_after.java"); myFixture.checkResultByFile("res/values/strings.xml", BASE_PATH + stringsAfter, false); } } From 5fc914f545127e146d6c8798ec37f0455f842844 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Tue, 24 Jan 2012 18:48:23 +0400 Subject: [PATCH 06/28] 'extract string' android intention: validate xml and dom in dialog --- .../android/actions/CreateXmlResourceDialog.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java b/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java index f6797c5924d5..dae344b92ced 100644 --- a/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java +++ b/plugins/android/src/org/jetbrains/android/actions/CreateXmlResourceDialog.java @@ -22,6 +22,7 @@ import org.jetbrains.android.facet.AndroidRootUtil; import org.jetbrains.android.resourceManagers.ResourceManager; import org.jetbrains.android.uipreview.DeviceConfiguratorPanel; import org.jetbrains.android.uipreview.InvalidOptionValueException; +import org.jetbrains.android.util.AndroidBundle; import org.jetbrains.android.util.AndroidResourceUtil; import org.jetbrains.android.util.AndroidUtils; import org.jetbrains.annotations.NotNull; @@ -182,13 +183,17 @@ public class CreateXmlResourceDialog extends DialogWrapper { } final VirtualFile resFile = resourceSubdir.findChild(fileName); - if (resFile == null || resFile.getFileType() != StdFileTypes.XML) { + if (resFile == null) { return null; } + if (resFile.getFileType() != StdFileTypes.XML) { + return new ValidationInfo("File " + FileUtil.toSystemDependentName(resFile.getPath()) + " is not XML file"); + } + final Resources resources = AndroidUtils.loadDomElement(selectedModule, resFile, Resources.class); if (resources == null) { - return null; + return new ValidationInfo(AndroidBundle.message("not.resource.file.error", FileUtil.toSystemDependentName(resFile.getPath()))); } for (ResourceElement element : ResourceManager.getValueResources(resourceType.getName(), resources)) { From c9def85bf0cf5dcaeda13d5683d626c79b777838 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Wed, 25 Jan 2012 13:19:27 +0400 Subject: [PATCH 07/28] android: "extract string" intention should work in manifest and only in attributes allowing string references --- .../ResourceReferenceConverter.java | 7 +- .../AndroidAddStringResourceAction.java | 42 ++++++++-- .../testData/addStringRes/fromLayout1.xml | 11 +++ .../testData/addStringRes/fromManifest.xml | 8 ++ .../testData/addStringRes/fromManifest1.xml | 8 ++ .../addStringRes/fromManifest1_after.xml | 8 ++ .../testData/addStringRes/fromManifest2.xml | 10 +++ .../AndroidAddStringResourceActionTest.java | 81 +++++++++++++------ 8 files changed, 142 insertions(+), 33 deletions(-) create mode 100644 plugins/android/testData/addStringRes/fromLayout1.xml create mode 100644 plugins/android/testData/addStringRes/fromManifest.xml create mode 100644 plugins/android/testData/addStringRes/fromManifest1.xml create mode 100644 plugins/android/testData/addStringRes/fromManifest1_after.xml create mode 100644 plugins/android/testData/addStringRes/fromManifest2.xml diff --git a/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java b/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java index ad7fee9ff8a5..e77187a20cde 100644 --- a/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java +++ b/plugins/android/src/org/jetbrains/android/dom/converters/ResourceReferenceConverter.java @@ -165,7 +165,12 @@ public class ResourceReferenceConverter extends ResolvingConverter getResourceTypes(ConvertContext context) { - ResourceType resourceType = context.getInvocationElement().getAnnotation(ResourceType.class); + return getResourceTypes(context.getInvocationElement()); + } + + @NotNull + public Set getResourceTypes(@NotNull DomElement element) { + ResourceType resourceType = element.getAnnotation(ResourceType.class); Set types = new HashSet(myResourceTypes); if (resourceType != null) { String s = resourceType.value(); diff --git a/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java b/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java index 0715cfc35f90..d22ddd0c21c2 100644 --- a/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java +++ b/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java @@ -45,8 +45,12 @@ import com.intellij.psi.xml.XmlAttributeValue; import com.intellij.psi.xml.XmlFile; import com.intellij.refactoring.util.RefactoringUtil; import com.intellij.util.IncorrectOperationException; +import com.intellij.util.xml.Converter; +import com.intellij.util.xml.DomManager; +import com.intellij.util.xml.GenericAttributeValue; import org.jetbrains.android.AndroidFileTemplateProvider; import org.jetbrains.android.actions.CreateXmlResourceDialog; +import org.jetbrains.android.dom.converters.ResourceReferenceConverter; import org.jetbrains.android.dom.manifest.Manifest; import org.jetbrains.android.dom.resources.ResourceElement; import org.jetbrains.android.dom.resources.ResourceValue; @@ -107,7 +111,29 @@ public class AndroidAddStringResourceAction extends AbstractIntentionAction { } } else if (file instanceof XmlFile && element instanceof XmlAttributeValue) { - return ((XmlAttributeValue)element).getValue(); + final XmlAttribute attribute = PsiTreeUtil.getParentOfType(element, XmlAttribute.class); + + if (attribute != null) { + final GenericAttributeValue domAttribute = DomManager.getDomManager(element.getProject()).getDomElement(attribute); + + if (domAttribute != null) { + final Converter converter = domAttribute.getConverter(); + + if (converter instanceof ResourceReferenceConverter) { + final ResourceValue value = (ResourceValue)domAttribute.getValue(); + + if (value != null && !value.isReference()) { + final Set types = ((ResourceReferenceConverter)converter).getResourceTypes(domAttribute); + + for (String type : types) { + if (ResourceType.STRING.getName().equals(type)) { + return ((XmlAttributeValue)element).getValue(); + } + } + } + } + } + } } return null; } @@ -141,25 +167,25 @@ public class AndroidAddStringResourceAction extends AbstractIntentionAction { static void doInvoke(Project project, Editor editor, PsiFile file, @Nullable String resName) { final AndroidFacet facet = AndroidFacet.getInstance(file); assert facet != null; - + final PsiElement element = getPsiElement(file, editor); assert element != null; - + String value = getStringLiteralValue(element, file); assert value != null; value = value.replace("'", "\\'").replace("\"", "\\\""); - + final String aPackage = getPackage(facet); if (aPackage == null) { Messages.showErrorDialog(project, AndroidBundle.message("package.not.found.error"), CommonBundle.getErrorTitle()); return; } - + if (resName == null) { final CreateXmlResourceDialog dialog = new CreateXmlResourceDialog(facet.getModule(), ResourceType.STRING); dialog.setTitle("Extract String Resource"); dialog.show(); - + if (!dialog.isOK()) { return; } @@ -180,7 +206,7 @@ public class AndroidAddStringResourceAction extends AbstractIntentionAction { assert ApplicationManager.getApplication().isUnitTestMode(); doCreate(facet.getModule(), resName, ResourceType.STRING, "strings.xml", "values", value); } - + if (resName == null) { return; } @@ -194,7 +220,7 @@ public class AndroidAddStringResourceAction extends AbstractIntentionAction { attribute.setValue(ResourceValue.referenceTo('@', null, ResourceType.STRING.getName(), resName).toString()); } } - + PsiDocumentManager.getInstance(project).commitAllDocuments(); UndoUtil.markPsiFileForUndo(file); diff --git a/plugins/android/testData/addStringRes/fromLayout1.xml b/plugins/android/testData/addStringRes/fromLayout1.xml new file mode 100644 index 000000000000..f152f913e39d --- /dev/null +++ b/plugins/android/testData/addStringRes/fromLayout1.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/addStringRes/fromManifest.xml b/plugins/android/testData/addStringRes/fromManifest.xml new file mode 100644 index 000000000000..2997ac33cd72 --- /dev/null +++ b/plugins/android/testData/addStringRes/fromManifest.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/plugins/android/testData/addStringRes/fromManifest1.xml b/plugins/android/testData/addStringRes/fromManifest1.xml new file mode 100644 index 000000000000..3b6843287cb9 --- /dev/null +++ b/plugins/android/testData/addStringRes/fromManifest1.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/plugins/android/testData/addStringRes/fromManifest1_after.xml b/plugins/android/testData/addStringRes/fromManifest1_after.xml new file mode 100644 index 000000000000..e7ed000835ae --- /dev/null +++ b/plugins/android/testData/addStringRes/fromManifest1_after.xml @@ -0,0 +1,8 @@ + + + + + diff --git a/plugins/android/testData/addStringRes/fromManifest2.xml b/plugins/android/testData/addStringRes/fromManifest2.xml new file mode 100644 index 000000000000..1f1431a0ecb7 --- /dev/null +++ b/plugins/android/testData/addStringRes/fromManifest2.xml @@ -0,0 +1,10 @@ + + + + + + + diff --git a/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java b/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java index 5ccbde1c42bf..c2970ace69c0 100644 --- a/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java +++ b/plugins/android/testSrc/org/jetbrains/android/intentions/AndroidAddStringResourceActionTest.java @@ -11,12 +11,18 @@ import com.intellij.util.IncorrectOperationException; import org.jetbrains.android.AndroidTestCase; import org.jetbrains.annotations.Nullable; +import java.io.IOException; + /** * @author Eugene.Kudelevsky */ public class AndroidAddStringResourceActionTest extends AndroidTestCase { private static final String BASE_PATH = "addStringRes/"; + public AndroidAddStringResourceActionTest() { + super(false); + } + @Override public void setUp() throws Exception { super.setUp(); @@ -29,31 +35,31 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { super.tearDown(); } - public void test1() { + public void test1() throws IOException { doTest(); } - public void test2() { + public void test2() throws IOException { doTest(); } - public void test3() { + public void test3() throws IOException { doTest(); } - public void test4() { + public void test4() throws IOException { doTest(); } - public void test5() { + public void test5() throws IOException { doTest(); } - public void test6() { + public void test6() throws IOException { doTest(); } - public void test7() { + public void test7() throws IOException { doTest(new Runnable() { @Override public void run() { @@ -63,19 +69,19 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { }); } - public void test8() { + public void test8() throws IOException { doTest(); } - public void test9() { + public void test9() throws IOException { doTest(); } - public void test10() { + public void test10() throws IOException { doTest(); } - public void test11() { + public void test11() throws IOException { doTest(new Runnable() { @Override public void run() { @@ -85,11 +91,11 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { }); } - public void test12() { + public void test12() throws IOException { doTest(); } - public void test13() { + public void test13() throws IOException { doTest(); } @@ -100,15 +106,15 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { assertFalse(new AndroidAddStringResourceAction().isAvailable(myFixture.getProject(), myFixture.getEditor(), javaPsiFile)); } - public void testEscape() { + public void testEscape() throws IOException { doTest(getTestName(false), "strings.xml", null, true, "strings_escape_after.xml"); } - public void testNewFile() { + public void testNewFile() throws IOException { doTest("1", null, null, true); } - public void testInvalidStringsXml() { + public void testInvalidStringsXml() throws IOException { try { doTest("1", "strings_invalid.xml", null, true); fail(); @@ -121,21 +127,47 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { myFixture.checkResultByFile("res/values/strings.xml", BASE_PATH + "strings_invalid.xml", false); } - public void testFromLayout() { - final VirtualFile javaFile = myFixture.copyFileToProject(BASE_PATH + getTestName(false) + ".xml", "res/layout/layout.xml"); - doExtractAndCheckStringsXml("strings.xml", null, true, "strings_after.xml", javaFile); - myFixture.checkResultByFile(BASE_PATH + getTestName(false) + "_after.xml"); + public void testFromLayout() throws IOException { + createManifest(); + final VirtualFile file = myFixture.copyFileToProject(BASE_PATH + getTestName(true) + ".xml", "res/layout/layout.xml"); + doExtractAndCheckStringsXml("strings.xml", null, true, "strings_after.xml", file); + myFixture.checkResultByFile(BASE_PATH + getTestName(true) + "_after.xml"); } - private void doTest() { + public void testFromLayout1() throws IOException { + createManifest(); + final VirtualFile file = myFixture.copyFileToProject(BASE_PATH + getTestName(true) + ".xml", "res/layout/layout.xml"); + myFixture.configureFromExistingVirtualFile(file); + assertFalse(new AndroidAddStringResourceAction().isAvailable(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile())); + } + + public void testFromManifest() { + final VirtualFile file = myFixture.copyFileToProject(BASE_PATH + getTestName(true) + ".xml", "AndroidManifest.xml"); + myFixture.configureFromExistingVirtualFile(file); + assertFalse(new AndroidAddStringResourceAction().isAvailable(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile())); + } + + public void testFromManifest1() { + final VirtualFile file = myFixture.copyFileToProject(BASE_PATH + getTestName(true) + ".xml", "AndroidManifest.xml"); + doExtractAndCheckStringsXml("strings.xml", null, true, "strings_after.xml", file); + myFixture.checkResultByFile(BASE_PATH + getTestName(true) + "_after.xml"); + } + + public void testFromManifest2() { + final VirtualFile file = myFixture.copyFileToProject(BASE_PATH + getTestName(true) + ".xml", "AndroidManifest.xml"); + myFixture.configureFromExistingVirtualFile(file); + assertFalse(new AndroidAddStringResourceAction().isAvailable(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile())); + } + + private void doTest() throws IOException { doTest(getTestName(false), "strings.xml", null, true); } - private void doTest(Runnable invokeAfterTemplate) { + private void doTest(Runnable invokeAfterTemplate) throws IOException { doTest(getTestName(false), "strings.xml", invokeAfterTemplate, false); } - private void doTest(String testName, String stringsXml, final Runnable invokeAfterTemplate, final boolean closePopup) { + private void doTest(String testName, String stringsXml, final Runnable invokeAfterTemplate, final boolean closePopup) throws IOException { doTest(testName, stringsXml, invokeAfterTemplate, closePopup, "strings_after.xml"); } @@ -143,7 +175,8 @@ public class AndroidAddStringResourceActionTest extends AndroidTestCase { String stringsXml, @Nullable final Runnable invokeAfterTemplate, final boolean closePopup, - String stringsAfter) { + String stringsAfter) throws IOException { + createManifest(); VirtualFile javaFile = myFixture.copyFileToProject(BASE_PATH + "Class" + testName + ".java", "src/p1/p2/Class.java"); doExtractAndCheckStringsXml(stringsXml, invokeAfterTemplate, closePopup, stringsAfter, javaFile); myFixture.checkResultByFile(BASE_PATH + "Class" + testName + "_after.java"); From e36a22db6c00a017c9c8171bafaf9f14630551d7 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Thu, 26 Jan 2012 16:30:14 +0400 Subject: [PATCH 08/28] android: support quick fixes for lint; tests --- .../messages/AndroidBundle.properties | 17 +- .../lint/AddMissingPrefixQuickFix.java | 72 ++++++ .../AndroidAddStringResourceQuickFix.java | 47 ++++ .../lint/AndroidLintExternalAnnotator.java | 164 +++++++++---- .../AndroidLintGlobalInspectionContext.java | 20 +- .../lint/AndroidLintInspectionBase.java | 71 +++++- .../AndroidLintInspectionToolProvider.java | 124 ++++++++-- .../inspections/lint/AndroidLintQuickFix.java | 20 ++ .../inspections/lint/AndroidLintUtil.java | 57 +++++ .../inspections/lint/ConvertToDpQuickFix.java | 127 ++++++++++ .../android/inspections/lint/FakeNode.java | 200 ++++++++++++++++ .../lint/InefficientWeightQuickFix.java | 54 +++++ .../inspections/lint/IntellijLintClient.java | 6 + .../lint/IntellijLintConfiguration.java | 43 ++++ .../lint/RemoveAttributeQuickFix.java | 33 +++ .../lint/RemoveUselessViewQuickFix.java | 58 +++++ .../lint/SetAttributeQuickFix.java | 74 ++++++ .../lint/SetScrollViewSizeQuickFix.java | 50 ++++ .../inspections/lint/TypographyQuickFix.java | 67 ++++++ .../AndroidAddStringResourceAction.java | 14 +- .../testData/lint/adapterViewChildren.xml | 9 + .../android/testData/lint/baselineWeights.xml | 7 + .../testData/lint/baselineWeights_after.xml | 7 + .../testData/lint/contentDescription.xml | 11 + .../testData/lint/contentDescription1.xml | 11 + .../lint/contentDescription_after.xml | 11 + plugins/android/testData/lint/convertToDp.xml | 6 + .../testData/lint/convertToDp_after.xml | 6 + .../android/testData/lint/duplicatedIds.xml | 17 ++ plugins/android/testData/lint/editText.xml | 6 + .../android/testData/lint/editText_after.xml | 6 + .../android/testData/lint/exportedService.xml | 9 + .../testData/lint/exportedService_after.xml | 9 + .../testData/lint/hardcodedQuickfix.xml | 12 + .../testData/lint/hardcodedQuickfix1.xml | 12 + .../lint/hardcodedQuickfix1_after.xml | 12 + .../testData/lint/hardcodedQuickfix_after.xml | 12 + .../testData/lint/inefficientWeight.xml | 12 + .../testData/lint/inefficientWeight_after.xml | 12 + .../android/testData/lint/missingPrefix.xml | 12 + .../android/testData/lint/missingPrefix1.xml | 12 + .../testData/lint/missingPrefix1_after.xml | 12 + .../testData/lint/missingPrefix_after.xml | 12 + .../testData/lint/obsoleteLayoutParams.xml | 6 + .../lint/obsoleteLayoutParams_after.xml | 6 + .../testData/lint/scrollViewChildren.xml | 10 + .../android/testData/lint/scrollViewSize.xml | 8 + .../testData/lint/scrollViewSize_after.xml | 8 + .../testData/lint/typographyDashes.xml | 4 + .../testData/lint/typographyDashes_after.xml | 4 + .../testData/lint/typographyQuotes.xml | 5 + .../testData/lint/typographyQuotes_after.xml | 5 + plugins/android/testData/lint/uselessLeaf.xml | 6 + .../testData/lint/uselessLeaf_after.xml | 5 + .../android/testData/lint/uselessParent.xml | 8 + .../jetbrains/android/AndroidLintTest.java | 217 ++++++++++++++++++ 56 files changed, 1764 insertions(+), 81 deletions(-) create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/AddMissingPrefixQuickFix.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/AndroidAddStringResourceQuickFix.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintQuickFix.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintUtil.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/ConvertToDpQuickFix.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/FakeNode.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/InefficientWeightQuickFix.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/IntellijLintConfiguration.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/RemoveAttributeQuickFix.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/RemoveUselessViewQuickFix.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/SetScrollViewSizeQuickFix.java create mode 100644 plugins/android/src/org/jetbrains/android/inspections/lint/TypographyQuickFix.java create mode 100644 plugins/android/testData/lint/adapterViewChildren.xml create mode 100644 plugins/android/testData/lint/baselineWeights.xml create mode 100644 plugins/android/testData/lint/baselineWeights_after.xml create mode 100644 plugins/android/testData/lint/contentDescription.xml create mode 100644 plugins/android/testData/lint/contentDescription1.xml create mode 100644 plugins/android/testData/lint/contentDescription_after.xml create mode 100644 plugins/android/testData/lint/convertToDp.xml create mode 100644 plugins/android/testData/lint/convertToDp_after.xml create mode 100644 plugins/android/testData/lint/duplicatedIds.xml create mode 100644 plugins/android/testData/lint/editText.xml create mode 100644 plugins/android/testData/lint/editText_after.xml create mode 100644 plugins/android/testData/lint/exportedService.xml create mode 100644 plugins/android/testData/lint/exportedService_after.xml create mode 100644 plugins/android/testData/lint/hardcodedQuickfix.xml create mode 100644 plugins/android/testData/lint/hardcodedQuickfix1.xml create mode 100644 plugins/android/testData/lint/hardcodedQuickfix1_after.xml create mode 100644 plugins/android/testData/lint/hardcodedQuickfix_after.xml create mode 100644 plugins/android/testData/lint/inefficientWeight.xml create mode 100644 plugins/android/testData/lint/inefficientWeight_after.xml create mode 100644 plugins/android/testData/lint/missingPrefix.xml create mode 100644 plugins/android/testData/lint/missingPrefix1.xml create mode 100644 plugins/android/testData/lint/missingPrefix1_after.xml create mode 100644 plugins/android/testData/lint/missingPrefix_after.xml create mode 100644 plugins/android/testData/lint/obsoleteLayoutParams.xml create mode 100644 plugins/android/testData/lint/obsoleteLayoutParams_after.xml create mode 100644 plugins/android/testData/lint/scrollViewChildren.xml create mode 100644 plugins/android/testData/lint/scrollViewSize.xml create mode 100644 plugins/android/testData/lint/scrollViewSize_after.xml create mode 100644 plugins/android/testData/lint/typographyDashes.xml create mode 100644 plugins/android/testData/lint/typographyDashes_after.xml create mode 100644 plugins/android/testData/lint/typographyQuotes.xml create mode 100644 plugins/android/testData/lint/typographyQuotes_after.xml create mode 100644 plugins/android/testData/lint/uselessLeaf.xml create mode 100644 plugins/android/testData/lint/uselessLeaf_after.xml create mode 100644 plugins/android/testData/lint/uselessParent.xml create mode 100644 plugins/android/testSrc/org/jetbrains/android/AndroidLintTest.java diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties index 2b6ad57b277f..4ed608cd7172 100644 --- a/plugins/android/resources/messages/AndroidBundle.properties +++ b/plugins/android/resources/messages/AndroidBundle.properties @@ -307,4 +307,19 @@ android.export.package.run.proguard.label=Run &ProGuard android.export.package.proguad.config.label=C&onfig file path\: android.extract.package.specify.proguard.cfg.path.error=Please specify ProGuard config file path android.inspections.lint.name=Android Lint Validation -android.lint.quickfixes.family=Android Lint Quick Fixes \ No newline at end of file +android.lint.quickfixes.family=Android Lint Quick Fixes +android.lint.inspections.add.content.description=Add 'contentDescription' attribute +android.lint.inspections.scroll.view.children=ScrollView element can have only one child +android.lint.inspections.deprecated=Deprecated XML elements +android.lint.inspections.missing.prefix=Missing android XML namespace +android.lint.inspections.adapter.view.children=AdapterView element cannot have children +android.lint.inspections.add.android.prefix=Add android prefix +android.lint.inspections.replace.with.zero.dp=Replace size attribute with 0dp +android.lint.inspections.set.baseline.attribute=Set 'baselineAligned' attribute +android.lint.inspections.remove.attribute=Remove attribute +android.lint.inspections.convert.to.dp=Convert to \\"dp\\"... +android.lint.inspections.set.to.wrap.content=Replace size attribute with 'wrap_content' +android.lint.inspections.add.permission.attribute=Add 'permission' attribute +android.lint.inspections.add.input.type.attribute=Add 'inputType' attribute +android.lint.inspections.remove.unnecessary.view=Remove unnecessary view +android.lint.inspections.replace.with.suggested.characters=Replace with suggested characters \ No newline at end of file diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AddMissingPrefixQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AddMissingPrefixQuickFix.java new file mode 100644 index 000000000000..67b4c390ad08 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AddMissingPrefixQuickFix.java @@ -0,0 +1,72 @@ +package org.jetbrains.android.inspections.lint; + +import com.android.sdklib.SdkConstants; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.editor.Editor; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlAttribute; +import com.intellij.psi.xml.XmlFile; +import com.intellij.psi.xml.XmlTag; +import com.intellij.xml.XmlExtension; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.Collections; + +/** + * @author Eugene.Kudelevsky + */ +class AddMissingPrefixQuickFix implements AndroidLintQuickFix { + private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.inspections.lint.AddMissingPrefixQuickFix"); + + @Override + public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) { + final XmlAttribute attribute = PsiTreeUtil.getParentOfType(startElement, XmlAttribute.class, false); + if (attribute == null) { + return; + } + + final XmlTag tag = attribute.getParent(); + if (tag == null) { + LOG.debug("tag is null"); + return; + } + + String androidNsPrefix = tag.getPrefixByNamespace(SdkConstants.NS_RESOURCES); + + if (androidNsPrefix == null) { + final PsiFile file = tag.getContainingFile(); + final XmlExtension extension = XmlExtension.getExtension(file); + + if (extension == null) { + LOG.debug("Cannot get XmlExtension for file + " + file); + return; + } + + if (!(file instanceof XmlFile)) { + LOG.debug(file + " is not XmlFile"); + return; + } + + final XmlFile xmlFile = (XmlFile)file; + final String defaultPrefix = "android"; + extension.insertNamespaceDeclaration(xmlFile, null, Collections.singleton(SdkConstants.NS_RESOURCES), defaultPrefix, null); + androidNsPrefix = defaultPrefix; + } + attribute.setName(androidNsPrefix + ':' + attribute.getLocalName()); + } + + @Override + public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) { + return PsiTreeUtil.getParentOfType(startElement, XmlAttribute.class, false) != null; + } + + @NotNull + @Override + public String getName() { + return AndroidBundle.message("android.lint.inspections.add.android.prefix"); + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidAddStringResourceQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidAddStringResourceQuickFix.java new file mode 100644 index 000000000000..0a614f88a0d4 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidAddStringResourceQuickFix.java @@ -0,0 +1,47 @@ +package org.jetbrains.android.inspections.lint; + +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlAttribute; +import com.intellij.psi.xml.XmlAttributeValue; +import com.intellij.util.IncorrectOperationException; +import org.jetbrains.android.intentions.AndroidAddStringResourceAction; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Eugene.Kudelevsky + */ +public class AndroidAddStringResourceQuickFix extends AndroidAddStringResourceAction { + private final PsiElement myStartElement; + + public AndroidAddStringResourceQuickFix(@NotNull PsiElement startElement) { + myStartElement = startElement; + } + + @Override + public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) { + return getAttributeValue(myStartElement) != null; + } + + @Override + public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { + invokeIntention(project, editor, file, null); + } + + public void invokeIntention(Project project, Editor editor, PsiFile file, String resName) { + final XmlAttributeValue attributeValue = getAttributeValue(myStartElement); + if (attributeValue != null) { + doInvoke(project, editor, file, resName, attributeValue); + } + } + + @Nullable + private static XmlAttributeValue getAttributeValue(@NotNull PsiElement element) { + final XmlAttribute attribute = PsiTreeUtil.getParentOfType(element, XmlAttribute.class); + return attribute != null ? attribute.getValueElement() : null; + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintExternalAnnotator.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintExternalAnnotator.java index 8e49234ba547..b2a909b18df7 100644 --- a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintExternalAnnotator.java +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintExternalAnnotator.java @@ -7,11 +7,11 @@ import com.android.tools.lint.client.api.Lint; import com.android.tools.lint.detector.api.Issue; import com.intellij.codeHighlighting.HighlightDisplayLevel; import com.intellij.codeInsight.daemon.HighlightDisplayKey; +import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInspection.InspectionProfile; -import com.intellij.codeInspection.ex.CustomEditInspectionToolsSettingsAction; import com.intellij.codeInspection.ex.DisableInspectionToolAction; -import com.intellij.codeInspection.ex.InspectionToolWrapper; +import com.intellij.codeInspection.ex.EditInspectionToolsSettingsAction; import com.intellij.lang.annotation.Annotation; import com.intellij.lang.annotation.AnnotationHolder; import com.intellij.lang.annotation.ExternalAnnotator; @@ -22,7 +22,10 @@ import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.Iconable; +import com.intellij.openapi.util.Pair; +import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.psi.PsiElement; @@ -30,6 +33,7 @@ import com.intellij.psi.PsiFile; import com.intellij.util.IncorrectOperationException; import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.android.facet.AndroidRootUtil; +import org.jetbrains.android.util.AndroidBundle; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -62,7 +66,7 @@ public class AndroidLintExternalAnnotator extends ExternalAnnotator pair = getHighlighLevelAndInspection(issue, file); + final Pair pair = AndroidLintUtil.getHighlighLevelAndInspection(issue, file); if (pair == null) { continue; } final AndroidLintInspectionBase inspection = pair.getFirst(); final HighlightDisplayLevel displayLevel = pair.getSecond(); - + final Annotation annotation = createAnnotation(holder, message, range, displayLevel); if (inspection != null) { final HighlightDisplayKey key = HighlightDisplayKey.find(inspection.getShortName()); - + if (key != null) { - annotation.registerFix(new MyDisableInspectionFix(key)); - annotation.registerFix(new CustomEditInspectionToolsSettingsAction(key, new Computable() { - @Override - public String compute() { - return "Edit '" + inspection.getDisplayName() + "' inspection settings"; + final PsiElement startElement = file.findElementAt(range.getStartOffset()); + final PsiElement endElement = file.findElementAt(range.getEndOffset() - 1); + + if (startElement != null && endElement != null) { + for (AndroidLintQuickFix fix : inspection.getQuickFixes(message)) { + if (fix.isApplicable(startElement, endElement, false)) { + annotation.registerFix(new MyFixingIntention(fix, startElement, endElement)); + } } - })); + + for (IntentionAction intention : inspection.getIntentions(startElement, endElement)) { + annotation.registerFix(intention); + } + } + + annotation.registerFix(new MyDisableInspectionFix(key)); + annotation.registerFix(new MyEditInspectionToolsSettingsAction(key, inspection)); } } } @@ -189,36 +203,6 @@ public class AndroidLintExternalAnnotator extends ExternalAnnotator getHighlighLevelAndInspection(@NotNull Issue issue, - @NotNull PsiElement context) { - final String inspectionShortName = AndroidLintInspectionBase.getInspectionShortNameByIssue(issue); - if (inspectionShortName == null) { - return null; - } - - final HighlightDisplayKey key = HighlightDisplayKey.find(inspectionShortName); - if (key == null) { - return null; - } - - final InspectionProfile profile = InspectionProjectProfileManager.getInstance(context.getProject()).getInspectionProfile(); - if (!profile.isToolEnabled(key, context)) { - return null; - } - - final InspectionToolWrapper toolWrapper = - (InspectionToolWrapper)profile.getInspectionTool(inspectionShortName, context); - if (toolWrapper == null) { - return null; - } - - final AndroidLintInspectionBase inspection = (AndroidLintInspectionBase)toolWrapper.getTool(); - final HighlightDisplayLevel errorLevel = profile.getErrorLevel(key, context); - return new Pair(inspection, - errorLevel != null ? errorLevel : HighlightDisplayLevel.WARNING); - } - private static class MyDisableInspectionFix implements IntentionAction, Iconable { private final DisableInspectionToolAction myDisableInspectionToolAction; @@ -258,4 +242,90 @@ public class AndroidLintExternalAnnotator extends ExternalAnnotator getIssues() { @@ -128,13 +125,21 @@ class AndroidLintGlobalInspectionContext implements GlobalInspectionContextExten private final Project myProject; private final Map>> myProblemMap; private final AnalysisScope myScope; + private final Collection myIssues; private MyLintClient(@NotNull Project project, @NotNull Map>> problemMap, - @NotNull AnalysisScope scope) { + @NotNull AnalysisScope scope, + @NotNull Collection issues) { myProject = project; myProblemMap = problemMap; myScope = scope; + myIssues = issues; + } + + @Override + public Configuration getConfiguration(com.android.tools.lint.detector.api.Project project) { + return new IntellijLintConfiguration(myIssues); } @Override @@ -248,6 +253,9 @@ class AndroidLintGlobalInspectionContext implements GlobalInspectionContextExten @Override public List getJavaSourceFolders(com.android.tools.lint.detector.api.Project project) { final Module module = findModuleForLintProject(myProject, project); + if (module == null) { + return Collections.emptyList(); + } final VirtualFile[] sourceRoots = ModuleRootManager.getInstance(module).getSourceRoots(false); final List result = new ArrayList(sourceRoots.length); diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java index 5cc3fe5fa98d..dfec9b262f16 100644 --- a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionBase.java @@ -5,11 +5,13 @@ import com.android.tools.lint.detector.api.Issue; import com.android.tools.lint.detector.api.Severity; import com.intellij.analysis.AnalysisScope; import com.intellij.codeHighlighting.HighlightDisplayLevel; +import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInspection.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtil; +import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; @@ -34,12 +36,12 @@ import java.util.Map; /** * @author Eugene.Kudelevsky */ -abstract class AndroidLintInspectionBase extends GlobalInspectionTool { +public abstract class AndroidLintInspectionBase extends GlobalInspectionTool { private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.inspections.lint.AndroidLintInspectionBase"); private static final Map ourIssue2InspectionShortName = new HashMap(); - private final Issue myIssue; + protected final Issue myIssue; private final String[] myGroupPath; private final String myDisplayName; @@ -58,6 +60,29 @@ abstract class AndroidLintInspectionBase extends GlobalInspectionTool { addIssue(issue, getShortName()); } + @NotNull + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return AndroidLintQuickFix.EMPTY_ARRAY; + } + + @NotNull + protected IntentionAction[] getIntentions(@NotNull PsiElement startElement, @NotNull PsiElement endElement) { + return IntentionAction.EMPTY_ARRAY; + } + + @NotNull + private LocalQuickFix[] getLocalQuickFixes(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @NotNull String message) { + final AndroidLintQuickFix[] fixes = getQuickFixes(message); + final LocalQuickFix[] result = new LocalQuickFix[fixes.length]; + + for (int i = 0; i < fixes.length; i++) { + if (fixes[i].isApplicable(startElement, endElement, true)) { + result[i] = new MyLocalQuickFix(fixes[i]); + } + } + return result; + } + @Override public void runInspection(AnalysisScope scope, final InspectionManager manager, @@ -81,7 +106,7 @@ abstract class AndroidLintInspectionBase extends GlobalInspectionTool { for (final Map.Entry> entry : file2ProblemList.entrySet()) { final File file = entry.getKey(); final VirtualFile vFile = LocalFileSystem.getInstance().findFileByIoFile(file); - + if (vFile == null) { continue; } @@ -104,9 +129,9 @@ abstract class AndroidLintInspectionBase extends GlobalInspectionTool { } @NotNull - private static ProblemDescriptor[] computeProblemDescriptors(@NotNull PsiFile psiFile, - @NotNull InspectionManager manager, - @NotNull List problems) { + private ProblemDescriptor[] computeProblemDescriptors(@NotNull PsiFile psiFile, + @NotNull InspectionManager manager, + @NotNull List problems) { final List result = new ArrayList(); for (ProblemData problemData : problems) { @@ -128,9 +153,9 @@ abstract class AndroidLintInspectionBase extends GlobalInspectionTool { } } } - + if (f != null) { - result.add(manager.createProblemDescriptor(f, message, false, LocalQuickFix.EMPTY_ARRAY, + result.add(manager.createProblemDescriptor(f, message, false, getLocalQuickFixes(f, f, message), ProblemHighlightType.GENERIC_ERROR_OR_WARNING)); } } @@ -140,7 +165,8 @@ abstract class AndroidLintInspectionBase extends GlobalInspectionTool { if (startElement != null && endElement != null) { result.add(manager.createProblemDescriptor(startElement, endElement, message + "#loc", - ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false)); + ProblemHighlightType.GENERIC_ERROR_OR_WARNING, false, + getLocalQuickFixes(startElement, endElement, message))); } } } @@ -218,7 +244,7 @@ abstract class AndroidLintInspectionBase extends GlobalInspectionTool { @Override public boolean isEnabledByDefault() { - return true; + return myIssue.isEnabledByDefault(); } @NotNull @@ -254,4 +280,29 @@ abstract class AndroidLintInspectionBase extends GlobalInspectionTool { return null; } } + + static class MyLocalQuickFix implements LocalQuickFix { + private final AndroidLintQuickFix myLintQuickFix; + + MyLocalQuickFix(@NotNull AndroidLintQuickFix lintQuickFix) { + myLintQuickFix = lintQuickFix; + } + + @NotNull + @Override + public String getName() { + return myLintQuickFix.getName(); + } + + @NotNull + @Override + public String getFamilyName() { + return AndroidBundle.message("android.lint.quickfixes.family"); + } + + @Override + public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) { + myLintQuickFix.apply(descriptor.getStartElement(), descriptor.getEndElement(), null); + } + } } diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionToolProvider.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionToolProvider.java index 2c44d975a613..8beeef803494 100644 --- a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionToolProvider.java +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintInspectionToolProvider.java @@ -1,7 +1,13 @@ package org.jetbrains.android.inspections.lint; import com.android.tools.lint.checks.*; +import com.android.tools.lint.detector.api.Issue; +import com.android.tools.lint.detector.api.LintConstants; +import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInspection.InspectionToolProvider; +import com.intellij.psi.PsiElement; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.annotations.NotNull; /** * @author Eugene.Kudelevsky @@ -9,11 +15,11 @@ import com.intellij.codeInspection.InspectionToolProvider; public class AndroidLintInspectionToolProvider implements InspectionToolProvider { @Override public Class[] getInspectionClasses() { - return new Class[] { + return new Class[]{ AndroidLintContentDescriptionInspection.class, AndroidLintAdapterViewChildrenInspection.class, AndroidLintScrollViewCountInspection.class, - AndroidLintDeprecatedInspection.class, + //AndroidLintDeprecatedInspection.class, AndroidLintMissingPrefixInspection.class, AndroidLintDuplicateIdsInspection.class, AndroidLintGridLayoutInspection.class, @@ -169,29 +175,44 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider public AndroidLintContentDescriptionInspection() { super("Missing content description", AccessibilityDetector.ISSUE); } + + @NotNull + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[]{ + new SetAttributeQuickFix(AndroidBundle.message("android.lint.inspections.add.content.description"), + LintConstants.ATTR_CONTENT_DESCRIPTION, null) + }; + } } public static class AndroidLintAdapterViewChildrenInspection extends AndroidLintInspectionBase { public AndroidLintAdapterViewChildrenInspection() { - super("AdapterView element cannot have children", ChildCountDetector.ADAPTERVIEW_ISSUE); + super(AndroidBundle.message("android.lint.inspections.adapter.view.children"), ChildCountDetector.ADAPTERVIEW_ISSUE); } } public static class AndroidLintScrollViewCountInspection extends AndroidLintInspectionBase { public AndroidLintScrollViewCountInspection() { - super("ScrollView element can have only one child", ChildCountDetector.SCROLLVIEW_ISSUE); + super(AndroidBundle.message("android.lint.inspections.scroll.view.children"), ChildCountDetector.SCROLLVIEW_ISSUE); } } - public static class AndroidLintDeprecatedInspection extends AndroidLintInspectionBase { + // it seems we don't need it because we have our own 'deprecated api' inspection + /*public static class AndroidLintDeprecatedInspection extends AndroidLintInspectionBase { public AndroidLintDeprecatedInspection() { - super("Deprecated XML elements", DeprecationDetector.ISSUE); + super(AndroidBundle.message("android.lint.inspections.deprecated"), DeprecationDetector.ISSUE); } - } + }*/ public static class AndroidLintMissingPrefixInspection extends AndroidLintInspectionBase { public AndroidLintMissingPrefixInspection() { - super("Missing android XML namespace", DetectMissingPrefix.MISSING_NAMESPACE); + super(AndroidBundle.message("android.lint.inspections.missing.prefix"), DetectMissingPrefix.MISSING_NAMESPACE); + } + + @NotNull + @Override + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[]{new AddMissingPrefixQuickFix()}; } } @@ -211,12 +232,26 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider public AndroidLintHardcodedTextInspection() { super("Hardcoded text", HardcodedValuesDetector.ISSUE); } + + @NotNull + @Override + protected IntentionAction[] getIntentions(@NotNull final PsiElement startElement, @NotNull PsiElement endElement) { + return new IntentionAction[]{new AndroidAddStringResourceQuickFix(startElement)}; + } } public static class AndroidLintInefficientWeightInspection extends AndroidLintInspectionBase { public AndroidLintInefficientWeightInspection() { super("Inefficient layout weight", InefficientWeightDetector.INEFFICIENT_WEIGHT); } + + @NotNull + @Override + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[]{ + new InefficientWeightQuickFix() + }; + } } public static class AndroidLintNestedWeightsInspection extends AndroidLintInspectionBase { @@ -229,6 +264,15 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider public AndroidLintDisableBaselineAlignmentInspection() { super("Missing baselineAligned attribute", InefficientWeightDetector.BASELINE_WEIGHTS); } + + @NotNull + @Override + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[]{ + new SetAttributeQuickFix(AndroidBundle.message("android.lint.inspections.set.baseline.attribute"), + LintConstants.ATTR_BASELINE_ALIGNED, "false") + }; + } } public static class AndroidLintManifestOrderInspection extends AndroidLintInspectionBase { @@ -253,6 +297,12 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider public AndroidLintObsoleteLayoutParamInspection() { super("Obsolete layout params", ObsoleteLayoutParamsDetector.ISSUE); } + + @NotNull + @Override + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[]{new RemoveAttributeQuickFix()}; + } } public static class AndroidLintProguardInspection extends AndroidLintInspectionBase { @@ -265,18 +315,39 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider public AndroidLintPxUsageInspection() { super("Using 'px' dimension", PxUsageDetector.ISSUE); } + + @NotNull + @Override + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[]{new ConvertToDpQuickFix()}; + } } public static class AndroidLintScrollViewSizeInspection extends AndroidLintInspectionBase { public AndroidLintScrollViewSizeInspection() { super("ScrollView size validation", ScrollViewChildDetector.ISSUE); } + + @NotNull + @Override + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[]{new SetScrollViewSizeQuickFix()}; + } } public static class AndroidLintExportedServiceInspection extends AndroidLintInspectionBase { public AndroidLintExportedServiceInspection() { super("Exported service does not require permission", SecurityDetector.EXPORTED_SERVICE); } + + @NotNull + @Override + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[]{ + new SetAttributeQuickFix(AndroidBundle.message("android.lint.inspections.add.permission.attribute"), + LintConstants.ATTR_PERMISSION, null) + }; + } } public static class AndroidLintGrantAllUrisInspection extends AndroidLintInspectionBase { @@ -295,6 +366,15 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider public AndroidLintTextFieldsInspection() { super("Text field missing inputType or hint settings", TextFieldDetector.ISSUE); } + + @NotNull + @Override + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[]{ + new SetAttributeQuickFix(AndroidBundle.message("android.lint.inspections.add.input.type.attribute"), + LintConstants.ATTR_INPUT_TYPE, null) + }; + } } public static class AndroidLintTooManyViewsInspection extends AndroidLintInspectionBase { @@ -309,31 +389,31 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider } } - public static class AndroidLintTypographyDashesInspection extends AndroidLintInspectionBase { + public static class AndroidLintTypographyDashesInspection extends AndroidLintTypographyInspectionBase { public AndroidLintTypographyDashesInspection() { super("Hyphen can be replaced by dash", TypographyDetector.DASHES); } } - public static class AndroidLintTypographyQuotesInspection extends AndroidLintInspectionBase { + public static class AndroidLintTypographyQuotesInspection extends AndroidLintTypographyInspectionBase { public AndroidLintTypographyQuotesInspection() { super("Straight quotes can be replaced by curvy quotes", TypographyDetector.QUOTES); } } - public static class AndroidLintTypographyFractionsInspection extends AndroidLintInspectionBase { + public static class AndroidLintTypographyFractionsInspection extends AndroidLintTypographyInspectionBase { public AndroidLintTypographyFractionsInspection() { super("Fraction string can be replaced with fraction character", TypographyDetector.FRACTIONS); } } - public static class AndroidLintTypographyEllipsisInspection extends AndroidLintInspectionBase { + public static class AndroidLintTypographyEllipsisInspection extends AndroidLintTypographyInspectionBase { public AndroidLintTypographyEllipsisInspection() { super("Ellipsis string can be replaced with ellipsis character", TypographyDetector.ELLIPSIS); } } - public static class AndroidLintTypographyOtherInspection extends AndroidLintInspectionBase { + public static class AndroidLintTypographyOtherInspection extends AndroidLintTypographyInspectionBase { public AndroidLintTypographyOtherInspection() { super("Other typographical problems", TypographyDetector.OTHER); } @@ -355,5 +435,23 @@ public class AndroidLintInspectionToolProvider implements InspectionToolProvider public AndroidLintUselessLeafInspection() { super("Useless leaf layout", UselessViewDetector.USELESS_LEAF); } + + @NotNull + @Override + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[]{new RemoveUselessViewQuickFix(myIssue)}; + } + } + + private static class AndroidLintTypographyInspectionBase extends AndroidLintInspectionBase { + public AndroidLintTypographyInspectionBase(String displayName, Issue issue) { + super(displayName, issue); + } + + @NotNull + @Override + protected AndroidLintQuickFix[] getQuickFixes(@NotNull String message) { + return new AndroidLintQuickFix[] {new TypographyQuickFix(myIssue, message)}; + } } } diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintQuickFix.java new file mode 100644 index 000000000000..f029cb923057 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintQuickFix.java @@ -0,0 +1,20 @@ +package org.jetbrains.android.inspections.lint; + +import com.intellij.openapi.editor.Editor; +import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Eugene.Kudelevsky + */ +interface AndroidLintQuickFix { + AndroidLintQuickFix[] EMPTY_ARRAY = new AndroidLintQuickFix[0]; + + void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor); + + boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode); + + @NotNull + String getName(); +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintUtil.java b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintUtil.java new file mode 100644 index 000000000000..95767ccf261b --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/AndroidLintUtil.java @@ -0,0 +1,57 @@ +package org.jetbrains.android.inspections.lint; + +import com.android.tools.lint.detector.api.Issue; +import com.intellij.codeHighlighting.HighlightDisplayLevel; +import com.intellij.codeInsight.daemon.HighlightDisplayKey; +import com.intellij.codeInspection.InspectionProfile; +import com.intellij.codeInspection.ex.InspectionToolWrapper; +import com.intellij.openapi.util.Pair; +import com.intellij.profile.codeInspection.InspectionProjectProfileManager; +import com.intellij.psi.PsiElement; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Eugene.Kudelevsky + */ +class AndroidLintUtil { + @NonNls static final String ATTR_VALUE_VERTICAL = "vertical"; + @NonNls static final String ATTR_VALUE_WRAP_CONTENT = "wrap_content"; + @NonNls static final String ATTR_LAYOUT_HEIGHT = "layout_height"; + @NonNls static final String ATTR_LAYOUT_WIDTH = "layout_width"; + @NonNls static final String ATTR_ORIENTATION = "orientation"; + + private AndroidLintUtil() { + } + + @Nullable + static Pair getHighlighLevelAndInspection(@NotNull Issue issue, + @NotNull PsiElement context) { + final String inspectionShortName = AndroidLintInspectionBase.getInspectionShortNameByIssue(issue); + if (inspectionShortName == null) { + return null; + } + + final HighlightDisplayKey key = HighlightDisplayKey.find(inspectionShortName); + if (key == null) { + return null; + } + + final InspectionProfile profile = InspectionProjectProfileManager.getInstance(context.getProject()).getInspectionProfile(); + if (!profile.isToolEnabled(key, context)) { + return null; + } + + final InspectionToolWrapper toolWrapper = + (InspectionToolWrapper)profile.getInspectionTool(inspectionShortName, context); + if (toolWrapper == null) { + return null; + } + + final AndroidLintInspectionBase inspection = (AndroidLintInspectionBase)toolWrapper.getTool(); + final HighlightDisplayLevel errorLevel = profile.getErrorLevel(key, context); + return new Pair(inspection, + errorLevel != null ? errorLevel : HighlightDisplayLevel.WARNING); + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/ConvertToDpQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/ConvertToDpQuickFix.java new file mode 100644 index 000000000000..e0190e1bc360 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/ConvertToDpQuickFix.java @@ -0,0 +1,127 @@ +package org.jetbrains.android.inspections.lint; + +import com.android.resources.Density; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.ui.Messages; +import com.intellij.psi.PsiElement; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlAttribute; +import com.intellij.psi.xml.XmlTag; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * @author Eugene.Kudelevsky + */ +class ConvertToDpQuickFix implements AndroidLintQuickFix { + private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.inspections.lint.ConvertToDpQuickFix"); + private static final Pattern PX_ATTR_VALUE_PATTERN = Pattern.compile("(\\d+)px"); + + private static int ourPrevDpi = Density.DEFAULT_DENSITY; + + @Override + public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) { + if (editor == null) { + return; + } + final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class); + final List densities = new ArrayList(); + + for (Density density : Density.values()) { + if (density.getDpiValue() > 0) { + densities.add(density); + } + } + + final String[] densityPresentableNames = new String[densities.size()]; + + String defaultValue = null; + String initialValue = null; + + for (int i = 0; i < densities.size(); i++) { + final Density density = densities.get(i); + densityPresentableNames[i] = getLabelForDensity(density); + + final int dpi = density.getDpiValue(); + if (dpi == 0) { + continue; + } + + if (dpi == ourPrevDpi) { + initialValue = densityPresentableNames[i]; + } + else if (dpi == Density.DEFAULT_DENSITY) { + defaultValue = densityPresentableNames[i]; + } + } + + if (initialValue == null) { + initialValue = defaultValue; + } + if (initialValue == null) { + return; + } + + final int dpi; + + if (ApplicationManager.getApplication().isUnitTestMode()) { + dpi = Density.DEFAULT_DENSITY; + } + else { + final int selectedIndex = Messages + .showChooseDialog("What is the screen density the current px value works with?", "Choose density", densityPresentableNames, + initialValue, null); + if (selectedIndex < 0) { + return; + } + dpi = densities.get(selectedIndex).getDpiValue(); + } + + //noinspection AssignmentToStaticFieldFromInstanceMethod + ourPrevDpi = dpi; + + for (XmlAttribute attribute : tag.getAttributes()) { + final String value = attribute.getValue(); + + if (value.endsWith("px")) { + final Matcher matcher = PX_ATTR_VALUE_PATTERN.matcher(value); + + if (matcher.matches()) { + final String numberString = matcher.group(1); + try { + final int px = Integer.parseInt(numberString); + final int dp = px * 160 / dpi; + attribute.setValue(Integer.toString(dp) + "dp"); + } + catch (NumberFormatException nufe) { + LOG.error(nufe); + } + } + } + } + } + + @NotNull + private static String getLabelForDensity(@NotNull Density density) { + return String.format("%1$s (%2$d)", density.getShortDisplayValue(), density.getDpiValue()); + } + + @Override + public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) { + return !inBatchMode && PsiTreeUtil.getParentOfType(startElement, XmlTag.class) != null; + } + + @NotNull + @Override + public String getName() { + return AndroidBundle.message("android.lint.inspections.convert.to.dp"); + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/FakeNode.java b/plugins/android/src/org/jetbrains/android/inspections/lint/FakeNode.java new file mode 100644 index 000000000000..8504add151a7 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/FakeNode.java @@ -0,0 +1,200 @@ +package org.jetbrains.android.inspections.lint; + +import org.jetbrains.annotations.NotNull; +import org.w3c.dom.*; + +/** + * @author Eugene.Kudelevsky + */ +class FakeNode implements Node { + private final String myText; + + FakeNode(@NotNull String text) { + myText = text; + } + + @Override + public String getNodeName() { + throw new UnsupportedOperationException(); + } + + @Override + public String getNodeValue() throws DOMException { + return myText; + } + + @Override + public void setNodeValue(String nodeValue) throws DOMException { + throw new UnsupportedOperationException(); + } + + @Override + public short getNodeType() { + throw new UnsupportedOperationException(); + } + + @Override + public Node getParentNode() { + throw new UnsupportedOperationException(); + } + + @Override + public NodeList getChildNodes() { + throw new UnsupportedOperationException(); + } + + @Override + public Node getFirstChild() { + throw new UnsupportedOperationException(); + } + + @Override + public Node getLastChild() { + throw new UnsupportedOperationException(); + } + + @Override + public Node getPreviousSibling() { + throw new UnsupportedOperationException(); + } + + @Override + public Node getNextSibling() { + throw new UnsupportedOperationException(); + } + + @Override + public NamedNodeMap getAttributes() { + throw new UnsupportedOperationException(); + } + + @Override + public Document getOwnerDocument() { + throw new UnsupportedOperationException(); + } + + @Override + public Node insertBefore(Node newChild, Node refChild) throws DOMException { + throw new UnsupportedOperationException(); + } + + @Override + public Node replaceChild(Node newChild, Node oldChild) throws DOMException { + throw new UnsupportedOperationException(); + } + + @Override + public Node removeChild(Node oldChild) throws DOMException { + throw new UnsupportedOperationException(); + } + + @Override + public Node appendChild(Node newChild) throws DOMException { + throw new UnsupportedOperationException(); + } + + @Override + public boolean hasChildNodes() { + throw new UnsupportedOperationException(); + } + + @Override + public Node cloneNode(boolean deep) { + throw new UnsupportedOperationException(); + } + + @Override + public void normalize() { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isSupported(String feature, String version) { + throw new UnsupportedOperationException(); + } + + @Override + public String getNamespaceURI() { + throw new UnsupportedOperationException(); + } + + @Override + public String getPrefix() { + throw new UnsupportedOperationException(); + } + + @Override + public void setPrefix(String prefix) throws DOMException { + throw new UnsupportedOperationException(); + } + + @Override + public String getLocalName() { + throw new UnsupportedOperationException(); + } + + @Override + public boolean hasAttributes() { + throw new UnsupportedOperationException(); + } + + @Override + public String getBaseURI() { + throw new UnsupportedOperationException(); + } + + @Override + public short compareDocumentPosition(Node other) throws DOMException { + throw new UnsupportedOperationException(); + } + + @Override + public String getTextContent() throws DOMException { + throw new UnsupportedOperationException(); + } + + @Override + public void setTextContent(String textContent) throws DOMException { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isSameNode(Node other) { + throw new UnsupportedOperationException(); + } + + @Override + public String lookupPrefix(String namespaceURI) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isDefaultNamespace(String namespaceURI) { + throw new UnsupportedOperationException(); + } + + @Override + public String lookupNamespaceURI(String prefix) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isEqualNode(Node arg) { + throw new UnsupportedOperationException(); + } + + @Override + public Object getFeature(String feature, String version) { + throw new UnsupportedOperationException(); + } + + @Override + public Object setUserData(String key, Object data, UserDataHandler handler) { + throw new UnsupportedOperationException(); + } + + @Override + public Object getUserData(String key) { + throw new UnsupportedOperationException(); + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/InefficientWeightQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/InefficientWeightQuickFix.java new file mode 100644 index 000000000000..7d2c4e6ee443 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/InefficientWeightQuickFix.java @@ -0,0 +1,54 @@ +package org.jetbrains.android.inspections.lint; + +import com.android.sdklib.SdkConstants; +import com.intellij.openapi.editor.Editor; +import com.intellij.psi.PsiElement; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlTag; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Eugene.Kudelevsky + */ +class InefficientWeightQuickFix implements AndroidLintQuickFix { + + @Override + public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) { + final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class); + if (tag == null) { + return; + } + + final XmlTag parentTag = tag.getParentTag(); + if (parentTag == null) { + return; + } + String attrName; + + if (AndroidLintUtil.ATTR_VALUE_VERTICAL + .equals(parentTag.getAttributeValue(AndroidLintUtil.ATTR_ORIENTATION, SdkConstants.NS_RESOURCES))) { + attrName = AndroidLintUtil.ATTR_LAYOUT_HEIGHT; + } + else { + attrName = AndroidLintUtil.ATTR_LAYOUT_WIDTH; + } + tag.setAttribute(attrName, SdkConstants.NS_RESOURCES, "0dp"); + } + + @Override + public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) { + final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class); + if (tag == null) { + return false; + } + return tag.getParentTag() != null; + } + + @NotNull + @Override + public String getName() { + return AndroidBundle.message("android.lint.inspections.replace.with.zero.dp"); + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/IntellijLintClient.java b/plugins/android/src/org/jetbrains/android/inspections/lint/IntellijLintClient.java index cab3907e7252..528970c87f64 100644 --- a/plugins/android/src/org/jetbrains/android/inspections/lint/IntellijLintClient.java +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/IntellijLintClient.java @@ -1,6 +1,7 @@ package org.jetbrains.android.inspections.lint; import com.android.tools.lint.PositionXmlParser; +import com.android.tools.lint.client.api.Configuration; import com.android.tools.lint.client.api.IDomParser; import com.android.tools.lint.client.api.LintClient; import com.android.tools.lint.detector.api.Context; @@ -43,6 +44,11 @@ class IntellijLintClient extends LintClient implements Disposable { myState = state; } + @Override + public Configuration getConfiguration(com.android.tools.lint.detector.api.Project project) { + return new IntellijLintConfiguration(myState.getIssues()); + } + @Override public void report(Context context, Issue issue, Location location, String message, Object data) { if (location != null) { diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/IntellijLintConfiguration.java b/plugins/android/src/org/jetbrains/android/inspections/lint/IntellijLintConfiguration.java new file mode 100644 index 000000000000..d24cede931b2 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/IntellijLintConfiguration.java @@ -0,0 +1,43 @@ +package org.jetbrains.android.inspections.lint; + +import com.android.tools.lint.client.api.Configuration; +import com.android.tools.lint.detector.api.Context; +import com.android.tools.lint.detector.api.Issue; +import com.android.tools.lint.detector.api.Location; +import com.android.tools.lint.detector.api.Severity; +import com.intellij.util.containers.HashSet; +import org.jetbrains.annotations.NotNull; + +import java.util.Collection; +import java.util.Set; + +/** + * @author Eugene.Kudelevsky + */ +class IntellijLintConfiguration extends Configuration { + private final Set myIssueSet; + + IntellijLintConfiguration(@NotNull Collection issueSet) { + myIssueSet = new HashSet(issueSet); + } + + @Override + public void ignore(Context context, Issue issue, Location location, String message, Object data) { + throw new UnsupportedOperationException(); + } + + @Override + public void setSeverity(Issue issue, Severity severity) { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isEnabled(Issue issue) { + return myIssueSet.contains(issue); + } + + @Override + public Severity getSeverity(Issue issue) { + return Severity.WARNING; + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveAttributeQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveAttributeQuickFix.java new file mode 100644 index 000000000000..b9d01eaba5e9 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveAttributeQuickFix.java @@ -0,0 +1,33 @@ +package org.jetbrains.android.inspections.lint; + +import com.intellij.openapi.editor.Editor; +import com.intellij.psi.PsiElement; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlAttribute; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Eugene.Kudelevsky + */ +class RemoveAttributeQuickFix implements AndroidLintQuickFix { + @Override + public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) { + final XmlAttribute attribute = PsiTreeUtil.getParentOfType(startElement, XmlAttribute.class); + if (attribute != null) { + attribute.getParent().setAttribute(attribute.getName(), null); + } + } + + @Override + public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) { + return PsiTreeUtil.getParentOfType(startElement, XmlAttribute.class) != null; + } + + @NotNull + @Override + public String getName() { + return AndroidBundle.message("android.lint.inspections.remove.attribute"); + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveUselessViewQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveUselessViewQuickFix.java new file mode 100644 index 000000000000..3c429b7fe435 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/RemoveUselessViewQuickFix.java @@ -0,0 +1,58 @@ +package org.jetbrains.android.inspections.lint; + +import com.android.tools.lint.checks.UselessViewDetector; +import com.android.tools.lint.detector.api.Issue; +import com.intellij.openapi.editor.Editor; +import com.intellij.psi.PsiElement; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlTag; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Eugene.Kudelevsky + */ +public class RemoveUselessViewQuickFix implements AndroidLintQuickFix { + private final Issue myIssue; + + public RemoveUselessViewQuickFix(@NotNull Issue issue) { + myIssue = issue; + } + + @Override + public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) { + final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class); + if (tag == null) { + return; + } + + final XmlTag parentTag = tag.getParentTag(); + if (parentTag == null) { + return; + } + + if (myIssue.getId().equals(UselessViewDetector.USELESS_LEAF.getId())) { + tag.delete(); + } + else { + assert false; + // todo: implement + } + } + + @Override + public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) { + final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class); + if (tag == null) { + return false; + } + return tag.getParentTag() != null; + } + + @NotNull + @Override + public String getName() { + return AndroidBundle.message("android.lint.inspections.remove.unnecessary.view"); + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java new file mode 100644 index 000000000000..4143549ef208 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/SetAttributeQuickFix.java @@ -0,0 +1,74 @@ +package org.jetbrains.android.inspections.lint; + +import com.android.sdklib.SdkConstants; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.util.TextRange; +import com.intellij.psi.PsiElement; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlAttribute; +import com.intellij.psi.xml.XmlAttributeValue; +import com.intellij.psi.xml.XmlTag; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Eugene.Kudelevsky + */ +class SetAttributeQuickFix implements AndroidLintQuickFix { + + private final String myName; + private final String myAttributeName; + private final String myValue; + + SetAttributeQuickFix(@NotNull String name, @NotNull String attributeName, @Nullable String value) { + super(); + myName = name; + myAttributeName = attributeName; + myValue = value; + } + + @NotNull + @Override + public String getName() { + return myName; + } + + @Override + public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) { + final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class, false); + + if (tag == null) { + return; + } + final XmlAttribute attribute = tag.setAttribute(myAttributeName, SdkConstants.NS_RESOURCES, ""); + + if (attribute != null) { + if (myValue != null) { + attribute.setValue(myValue); + } + if (editor != null) { + final XmlAttributeValue valueElement = attribute.getValueElement(); + final TextRange valueTextRange = attribute.getValueTextRange(); + + if (valueElement != null && valueTextRange != null) { + final int valueElementStart = valueElement.getTextRange().getStartOffset(); + editor.getCaretModel().moveToOffset(valueElementStart + valueTextRange.getStartOffset()); + + if (valueTextRange.getStartOffset() < valueTextRange.getEndOffset()) { + editor.getSelectionModel().setSelection(valueElementStart + valueTextRange.getStartOffset(), + valueElementStart + valueTextRange.getEndOffset()); + } + } + } + } + } + + @Override + public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) { + final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class, false); + if (tag == null) { + return false; + } + return tag.getAttribute(myAttributeName, SdkConstants.NS_RESOURCES) == null; + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/SetScrollViewSizeQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/SetScrollViewSizeQuickFix.java new file mode 100644 index 000000000000..336bb9a11f61 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/SetScrollViewSizeQuickFix.java @@ -0,0 +1,50 @@ +package org.jetbrains.android.inspections.lint; + +import com.android.sdklib.SdkConstants; +import com.android.tools.lint.detector.api.LintConstants; +import com.intellij.openapi.editor.Editor; +import com.intellij.psi.PsiElement; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlTag; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Eugene.Kudelevsky + */ +class SetScrollViewSizeQuickFix implements AndroidLintQuickFix { + @Override + public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) { + final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class); + if (tag == null) { + return; + } + + final XmlTag parentTag = tag.getParentTag(); + if (parentTag == null) { + return; + } + + final boolean isHorizontal = LintConstants.HORIZONTAL_SCROLL_VIEW.equals(parentTag.getName()); + final String attributeName = isHorizontal + ? AndroidLintUtil.ATTR_LAYOUT_WIDTH + : AndroidLintUtil.ATTR_LAYOUT_HEIGHT; + tag.setAttribute(attributeName, SdkConstants.NS_RESOURCES, AndroidLintUtil.ATTR_VALUE_WRAP_CONTENT); + } + + @Override + public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) { + final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class); + if (tag == null) { + return false; + } + return tag.getParentTag() != null; + } + + @NotNull + @Override + public String getName() { + return AndroidBundle.message("android.lint.inspections.set.to.wrap.content"); + } +} diff --git a/plugins/android/src/org/jetbrains/android/inspections/lint/TypographyQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/lint/TypographyQuickFix.java new file mode 100644 index 000000000000..74e7e737cdc8 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/inspections/lint/TypographyQuickFix.java @@ -0,0 +1,67 @@ +package org.jetbrains.android.inspections.lint; + +import com.android.tools.lint.checks.TypographyDetector; +import com.android.tools.lint.detector.api.Issue; +import com.intellij.openapi.editor.Editor; +import com.intellij.psi.PsiElement; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlTag; +import com.intellij.psi.xml.XmlText; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.util.List; + +/** + * @author Eugene.Kudelevsky + */ +class TypographyQuickFix implements AndroidLintQuickFix { + private final Issue myIssue; + private final String myMessage; + + public TypographyQuickFix(@NotNull Issue issue, @NotNull String message) { + myIssue = issue; + myMessage = message; + } + + @Override + public void apply(@NotNull PsiElement startElement, @NotNull PsiElement endElement, @Nullable Editor editor) { + final XmlTag tag = PsiTreeUtil.getParentOfType(startElement, XmlTag.class); + if (tag == null) { + return; + } + + for (PsiElement child : tag.getChildren()) { + if (child instanceof XmlText) { + final XmlText xmlText = (XmlText)child; + final String value = xmlText.getValue(); + + if (value != null) { + final List edits = TypographyDetector.getEdits(myIssue.getId(), myMessage, new FakeNode(value)); + final StringBuilder builder = new StringBuilder(value); + + for (TypographyDetector.ReplaceEdit edit : edits) { + builder.replace(edit.offset, edit.offset + edit.length, edit.replaceWith); + } + + final String newValue = builder.toString(); + if (!newValue.equals(value)) { + xmlText.setValue(newValue); + } + } + } + } + } + + @Override + public boolean isApplicable(@NotNull PsiElement startElement, @NotNull PsiElement endElement, boolean inBatchMode) { + return PsiTreeUtil.getParentOfType(startElement, XmlTag.class) != null; + } + + @NotNull + @Override + public String getName() { + return AndroidBundle.message("android.lint.inspections.replace.with.suggested.characters"); + } +} diff --git a/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java b/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java index d22ddd0c21c2..08e641d87637 100644 --- a/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java +++ b/plugins/android/src/org/jetbrains/android/intentions/AndroidAddStringResourceAction.java @@ -19,6 +19,7 @@ package org.jetbrains.android.intentions; import com.android.resources.ResourceType; import com.intellij.CommonBundle; import com.intellij.codeInsight.intention.AbstractIntentionAction; +import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.codeInsight.lookup.LookupElement; import com.intellij.codeInsight.lookup.LookupElementBuilder; import com.intellij.codeInsight.template.*; @@ -75,7 +76,7 @@ import static org.jetbrains.android.util.AndroidUtils.VIEW_CLASS_NAME; * Time: 5:02:31 PM * To change this template use File | Settings | File Templates. */ -public class AndroidAddStringResourceAction extends AbstractIntentionAction { +public class AndroidAddStringResourceAction extends AbstractIntentionAction implements HighPriorityAction { private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.intentions.AndroidAddStringResourceAction"); private static final String CONTEXT = AndroidUtils.ANDROID_PACKAGE + ".content.Context"; @@ -165,14 +166,19 @@ public class AndroidAddStringResourceAction extends AbstractIntentionAction { } static void doInvoke(Project project, Editor editor, PsiFile file, @Nullable String resName) { - final AndroidFacet facet = AndroidFacet.getInstance(file); - assert facet != null; - final PsiElement element = getPsiElement(file, editor); assert element != null; + doInvoke(project, editor, file, resName, element); + } + + protected static void doInvoke(Project project, Editor editor, PsiFile file, @Nullable String resName, PsiElement element) { String value = getStringLiteralValue(element, file); assert value != null; + + final AndroidFacet facet = AndroidFacet.getInstance(file); + assert facet != null; + value = value.replace("'", "\\'").replace("\"", "\\\""); final String aPackage = getPackage(facet); diff --git a/plugins/android/testData/lint/adapterViewChildren.xml b/plugins/android/testData/lint/adapterViewChildren.xml new file mode 100644 index 000000000000..9f92c86e6ecf --- /dev/null +++ b/plugins/android/testData/lint/adapterViewChildren.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/plugins/android/testData/lint/baselineWeights.xml b/plugins/android/testData/lint/baselineWeights.xml new file mode 100644 index 000000000000..a9bb155680e6 --- /dev/null +++ b/plugins/android/testData/lint/baselineWeights.xml @@ -0,0 +1,7 @@ + + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + + diff --git a/plugins/android/testData/lint/baselineWeights_after.xml b/plugins/android/testData/lint/baselineWeights_after.xml new file mode 100644 index 000000000000..65a523c3c9a8 --- /dev/null +++ b/plugins/android/testData/lint/baselineWeights_after.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/plugins/android/testData/lint/contentDescription.xml b/plugins/android/testData/lint/contentDescription.xml new file mode 100644 index 000000000000..f99ee50e6262 --- /dev/null +++ b/plugins/android/testData/lint/contentDescription.xml @@ -0,0 +1,11 @@ + + +geView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + /> + + diff --git a/plugins/android/testData/lint/contentDescription1.xml b/plugins/android/testData/lint/contentDescription1.xml new file mode 100644 index 000000000000..3966e0b9e16a --- /dev/null +++ b/plugins/android/testData/lint/contentDescription1.xml @@ -0,0 +1,11 @@ + + +android:contentDescription=""/> + + diff --git a/plugins/android/testData/lint/contentDescription_after.xml b/plugins/android/testData/lint/contentDescription_after.xml new file mode 100644 index 000000000000..f64caa929953 --- /dev/null +++ b/plugins/android/testData/lint/contentDescription_after.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/plugins/android/testData/lint/convertToDp.xml b/plugins/android/testData/lint/convertToDp.xml new file mode 100644 index 000000000000..6bc4c0dc8d8e --- /dev/null +++ b/plugins/android/testData/lint/convertToDp.xml @@ -0,0 +1,6 @@ + + + android:width="100px"/> + \ No newline at end of file diff --git a/plugins/android/testData/lint/convertToDp_after.xml b/plugins/android/testData/lint/convertToDp_after.xml new file mode 100644 index 000000000000..17c930637291 --- /dev/null +++ b/plugins/android/testData/lint/convertToDp_after.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/lint/duplicatedIds.xml b/plugins/android/testData/lint/duplicatedIds.xml new file mode 100644 index 000000000000..3f200a1b60bf --- /dev/null +++ b/plugins/android/testData/lint/duplicatedIds.xml @@ -0,0 +1,17 @@ + + + + android:id="@+id/id123" + /> + + diff --git a/plugins/android/testData/lint/editText.xml b/plugins/android/testData/lint/editText.xml new file mode 100644 index 000000000000..afd1ab54fc0d --- /dev/null +++ b/plugins/android/testData/lint/editText.xml @@ -0,0 +1,6 @@ + + + ayout_height="wrap_content"/> + \ No newline at end of file diff --git a/plugins/android/testData/lint/editText_after.xml b/plugins/android/testData/lint/editText_after.xml new file mode 100644 index 000000000000..f2c4ad49423f --- /dev/null +++ b/plugins/android/testData/lint/editText_after.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/lint/exportedService.xml b/plugins/android/testData/lint/exportedService.xml new file mode 100644 index 000000000000..b62fd1fc5b0a --- /dev/null +++ b/plugins/android/testData/lint/exportedService.xml @@ -0,0 +1,9 @@ + + + + android:exported="true"/> + + diff --git a/plugins/android/testData/lint/exportedService_after.xml b/plugins/android/testData/lint/exportedService_after.xml new file mode 100644 index 000000000000..014758a117f9 --- /dev/null +++ b/plugins/android/testData/lint/exportedService_after.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/plugins/android/testData/lint/hardcodedQuickfix.xml b/plugins/android/testData/lint/hardcodedQuickfix.xml new file mode 100644 index 000000000000..85cc775f1f5a --- /dev/null +++ b/plugins/android/testData/lint/hardcodedQuickfix.xml @@ -0,0 +1,12 @@ + + +android:text="Hello World, MyActivity" + /> + + diff --git a/plugins/android/testData/lint/hardcodedQuickfix1.xml b/plugins/android/testData/lint/hardcodedQuickfix1.xml new file mode 100644 index 000000000000..dc34d4a6e764 --- /dev/null +++ b/plugins/android/testData/lint/hardcodedQuickfix1.xml @@ -0,0 +1,12 @@ + + +android:text="Hello World, MyActivity" + /> + + diff --git a/plugins/android/testData/lint/hardcodedQuickfix1_after.xml b/plugins/android/testData/lint/hardcodedQuickfix1_after.xml new file mode 100644 index 000000000000..97da65a0b131 --- /dev/null +++ b/plugins/android/testData/lint/hardcodedQuickfix1_after.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/plugins/android/testData/lint/hardcodedQuickfix_after.xml b/plugins/android/testData/lint/hardcodedQuickfix_after.xml new file mode 100644 index 000000000000..97da65a0b131 --- /dev/null +++ b/plugins/android/testData/lint/hardcodedQuickfix_after.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/plugins/android/testData/lint/inefficientWeight.xml b/plugins/android/testData/lint/inefficientWeight.xml new file mode 100644 index 000000000000..65ebfc8958cf --- /dev/null +++ b/plugins/android/testData/lint/inefficientWeight.xml @@ -0,0 +1,12 @@ + + + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="10" + /> + + diff --git a/plugins/android/testData/lint/inefficientWeight_after.xml b/plugins/android/testData/lint/inefficientWeight_after.xml new file mode 100644 index 000000000000..ae8f06788487 --- /dev/null +++ b/plugins/android/testData/lint/inefficientWeight_after.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/plugins/android/testData/lint/missingPrefix.xml b/plugins/android/testData/lint/missingPrefix.xml new file mode 100644 index 000000000000..6934bcbf6f10 --- /dev/null +++ b/plugins/android/testData/lint/missingPrefix.xml @@ -0,0 +1,12 @@ + + + id="@+id/id123" + /> + + diff --git a/plugins/android/testData/lint/missingPrefix1.xml b/plugins/android/testData/lint/missingPrefix1.xml new file mode 100644 index 000000000000..3db882a6da7b --- /dev/null +++ b/plugins/android/testData/lint/missingPrefix1.xml @@ -0,0 +1,12 @@ + + + id="@+id/id123" + /> + + diff --git a/plugins/android/testData/lint/missingPrefix1_after.xml b/plugins/android/testData/lint/missingPrefix1_after.xml new file mode 100644 index 000000000000..6c736a2de094 --- /dev/null +++ b/plugins/android/testData/lint/missingPrefix1_after.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/plugins/android/testData/lint/missingPrefix_after.xml b/plugins/android/testData/lint/missingPrefix_after.xml new file mode 100644 index 000000000000..e007df753563 --- /dev/null +++ b/plugins/android/testData/lint/missingPrefix_after.xml @@ -0,0 +1,12 @@ + + + + + diff --git a/plugins/android/testData/lint/obsoleteLayoutParams.xml b/plugins/android/testData/lint/obsoleteLayoutParams.xml new file mode 100644 index 000000000000..4c57fe6e7006 --- /dev/null +++ b/plugins/android/testData/lint/obsoleteLayoutParams.xml @@ -0,0 +1,6 @@ + + + android:layout_row="10"/> + \ No newline at end of file diff --git a/plugins/android/testData/lint/obsoleteLayoutParams_after.xml b/plugins/android/testData/lint/obsoleteLayoutParams_after.xml new file mode 100644 index 000000000000..1f0a1aed7c07 --- /dev/null +++ b/plugins/android/testData/lint/obsoleteLayoutParams_after.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/lint/scrollViewChildren.xml b/plugins/android/testData/lint/scrollViewChildren.xml new file mode 100644 index 000000000000..55660b7e40b5 --- /dev/null +++ b/plugins/android/testData/lint/scrollViewChildren.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/plugins/android/testData/lint/scrollViewSize.xml b/plugins/android/testData/lint/scrollViewSize.xml new file mode 100644 index 000000000000..a5ee7b2c3647 --- /dev/null +++ b/plugins/android/testData/lint/scrollViewSize.xml @@ -0,0 +1,8 @@ + + + + android:layout_height="fill_parent"/> + + \ No newline at end of file diff --git a/plugins/android/testData/lint/scrollViewSize_after.xml b/plugins/android/testData/lint/scrollViewSize_after.xml new file mode 100644 index 000000000000..eb95fc26ed31 --- /dev/null +++ b/plugins/android/testData/lint/scrollViewSize_after.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/plugins/android/testData/lint/typographyDashes.xml b/plugins/android/testData/lint/typographyDashes.xml new file mode 100644 index 000000000000..7b68d3f92e0e --- /dev/null +++ b/plugins/android/testData/lint/typographyDashes.xml @@ -0,0 +1,4 @@ + + + 10-20 + \ No newline at end of file diff --git a/plugins/android/testData/lint/typographyDashes_after.xml b/plugins/android/testData/lint/typographyDashes_after.xml new file mode 100644 index 000000000000..35404e3362b2 --- /dev/null +++ b/plugins/android/testData/lint/typographyDashes_after.xml @@ -0,0 +1,4 @@ + + + 10–20 + \ No newline at end of file diff --git a/plugins/android/testData/lint/typographyQuotes.xml b/plugins/android/testData/lint/typographyQuotes.xml new file mode 100644 index 000000000000..cfe2294a0685 --- /dev/null +++ b/plugins/android/testData/lint/typographyQuotes.xml @@ -0,0 +1,5 @@ + + + untitled303 + aba 'aba' + diff --git a/plugins/android/testData/lint/typographyQuotes_after.xml b/plugins/android/testData/lint/typographyQuotes_after.xml new file mode 100644 index 000000000000..f0539ff7ece6 --- /dev/null +++ b/plugins/android/testData/lint/typographyQuotes_after.xml @@ -0,0 +1,5 @@ + + + untitled303 + aba ‘aba’ + diff --git a/plugins/android/testData/lint/uselessLeaf.xml b/plugins/android/testData/lint/uselessLeaf.xml new file mode 100644 index 000000000000..ae483929b35d --- /dev/null +++ b/plugins/android/testData/lint/uselessLeaf.xml @@ -0,0 +1,6 @@ + + + h="wrap_content" android:layout_height="wrap_content"/> + \ No newline at end of file diff --git a/plugins/android/testData/lint/uselessLeaf_after.xml b/plugins/android/testData/lint/uselessLeaf_after.xml new file mode 100644 index 000000000000..68d85c5e154b --- /dev/null +++ b/plugins/android/testData/lint/uselessLeaf_after.xml @@ -0,0 +1,5 @@ + + + \ No newline at end of file diff --git a/plugins/android/testData/lint/uselessParent.xml b/plugins/android/testData/lint/uselessParent.xml new file mode 100644 index 000000000000..54a49cc510f5 --- /dev/null +++ b/plugins/android/testData/lint/uselessParent.xml @@ -0,0 +1,8 @@ + + + r android:layout_width="wrap_content" android:layout_height="wrap_content"> + + + \ No newline at end of file diff --git a/plugins/android/testSrc/org/jetbrains/android/AndroidLintTest.java b/plugins/android/testSrc/org/jetbrains/android/AndroidLintTest.java new file mode 100644 index 000000000000..186b291dd2b4 --- /dev/null +++ b/plugins/android/testSrc/org/jetbrains/android/AndroidLintTest.java @@ -0,0 +1,217 @@ +package org.jetbrains.android; + +import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.codeInspection.ex.GlobalInspectionToolWrapper; +import com.intellij.openapi.application.Result; +import com.intellij.openapi.command.WriteCommandAction; +import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.android.inspections.lint.*; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import java.io.IOException; + +/** + * @author Eugene.Kudelevsky + */ +public class AndroidLintTest extends AndroidTestCase { + @NonNls private static final String BASE_PATH = "/lint/"; + + public AndroidLintTest() { + super(false); + } + + public void testHardcodedQuickfix() throws Exception { + doTestHardcodedQuickfix(); + } + + public void testHardcodedQuickfix1() throws Exception { + doTestHardcodedQuickfix(); + } + + private void doTestHardcodedQuickfix() throws IOException { + final IntentionAction action = doTestHighlightingAndGetQuickfix( + new AndroidLintInspectionToolProvider.AndroidLintHardcodedTextInspection(), + AndroidBundle.message("add.string.resource.intention.text"), false ? "AndroidManifest.xml" : "/res/layout/layout.xml", "xml"); + assertNotNull(action); + assertTrue(action.isAvailable(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile())); + + new WriteCommandAction(myFixture.getProject(), "") { + @Override + protected void run(Result result) throws Throwable { + ((AndroidAddStringResourceQuickFix)action) + .invokeIntention(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile(), "hello"); + } + }.execute(); + + myFixture.checkResultByFile(BASE_PATH + getTestName(true) + "_after.xml"); + } + + public void testContentDescription() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintContentDescriptionInspection(), + AndroidBundle.message("android.lint.inspections.add.content.description"), + "/res/layout/layout.xml", "xml"); + } + + public void testContentDescription1() throws Exception { + doTestNoFix(new AndroidLintInspectionToolProvider.AndroidLintContentDescriptionInspection(), + "/res/layout/layout.xml", "xml"); + } + + public void testAdapterViewChildren() throws Exception { + doTestNoFix(new AndroidLintInspectionToolProvider.AndroidLintAdapterViewChildrenInspection(), + "/res/layout/layout.xml", "xml"); + } + + public void testScrollViewChildren() throws Exception { + doTestNoFix(new AndroidLintInspectionToolProvider.AndroidLintScrollViewCountInspection(), + "/res/layout/layout.xml", "xml"); + } + + public void testMissingPrefix() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintMissingPrefixInspection(), + AndroidBundle.message("android.lint.inspections.add.android.prefix"), + "/res/layout/layout.xml", "xml"); + } + + public void testMissingPrefix1() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintMissingPrefixInspection(), + AndroidBundle.message("android.lint.inspections.add.android.prefix"), + "/res/layout/layout.xml", "xml"); + } + + public void testDuplicatedIds() throws Exception { + doTestNoFix(new AndroidLintInspectionToolProvider.AndroidLintDuplicateIdsInspection(), + "/res/layout/layout.xml", "xml"); + } + + public void testInefficientWeight() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintInefficientWeightInspection(), + AndroidBundle.message("android.lint.inspections.replace.with.zero.dp"), + "/res/layout/layout.xml", "xml"); + } + + public void testBaselineWeights() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintDisableBaselineAlignmentInspection(), + AndroidBundle.message("android.lint.inspections.set.baseline.attribute"), + "/res/layout/layout.xml", "xml"); + } + + public void testObsoleteLayoutParams() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintObsoleteLayoutParamInspection(), + AndroidBundle.message("android.lint.inspections.remove.attribute"), + "/res/layout/layout.xml", "xml"); + } + + public void testConvertToDp() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintPxUsageInspection(), + AndroidBundle.message("android.lint.inspections.convert.to.dp"), + "/res/layout/layout.xml", "xml"); + } + + public void testScrollViewSize() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintScrollViewSizeInspection(), + AndroidBundle.message("android.lint.inspections.set.to.wrap.content"), + "/res/layout/layout.xml", "xml"); + } + + public void testExportedService() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintExportedServiceInspection(), + AndroidBundle.message("android.lint.inspections.add.permission.attribute"), + "AndroidManifest.xml", "xml"); + } + + public void testEditText() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintTextFieldsInspection(), + AndroidBundle.message("android.lint.inspections.add.input.type.attribute"), + "/res/layout/layout.xml", "xml"); + } + + public void testUselessLeaf() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintUselessLeafInspection(), + AndroidBundle.message("android.lint.inspections.remove.unnecessary.view"), + "/res/layout/layout.xml", "xml"); + } + + public void testUselessParent() throws Exception { + doTestNoFix(new AndroidLintInspectionToolProvider.AndroidLintUselessParentInspection(), + "/res/layout/layout.xml", "xml"); + } + + public void testTypographyDashes() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintTypographyDashesInspection(), + AndroidBundle.message("android.lint.inspections.replace.with.suggested.characters"), + "/res/values/typography.xml", "xml"); + } + + public void testTypographyQuotes() throws Exception { + doTestWithFix(new AndroidLintInspectionToolProvider.AndroidLintTypographyQuotesInspection(), + AndroidBundle.message("android.lint.inspections.replace.with.suggested.characters"), + "/res/values/typography.xml", "xml"); + } + + private void doTestNoFix(@NotNull AndroidLintInspectionBase inspection, @NotNull String copyTo, @NotNull String extension) + throws IOException { + doTestHighlighting(inspection, copyTo, extension); + + IntentionAction action = null; + + for (IntentionAction a : myFixture.getAvailableIntentions()) { + if (a instanceof AndroidLintExternalAnnotator.MyFixingIntention) { + action = a; + } + } + assertNull(action); + } + + private void doTestWithFix(@NotNull AndroidLintInspectionBase inspection, + @NotNull String message, + @NotNull String copyTo, + @NotNull String extension) + throws IOException { + final IntentionAction action = doTestHighlightingAndGetQuickfix(inspection, message, copyTo, extension); + assertNotNull(action); + assertTrue(action.isAvailable(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile())); + + new WriteCommandAction(myFixture.getProject(), "") { + @Override + protected void run(Result result) throws Throwable { + action.invoke(myFixture.getProject(), myFixture.getEditor(), myFixture.getFile()); + } + }.execute(); + + myFixture.checkResultByFile(BASE_PATH + getTestName(true) + "_after." + extension); + } + + @Nullable + private IntentionAction doTestHighlightingAndGetQuickfix(@NotNull AndroidLintInspectionBase inspection, + @NotNull String message, + @NotNull String copyTo, + @NotNull String extension) throws IOException { + doTestHighlighting(inspection, copyTo, extension); + + IntentionAction action = null; + + for (IntentionAction a : myFixture.getAvailableIntentions()) { + if (message.equals(a.getText())) { + action = a; + } + } + return action; + } + + private void doTestHighlighting(@NotNull AndroidLintInspectionBase inspection, @NotNull String copyTo, @NotNull String extension) + throws IOException { + if (!"AndroidManifest.xml".equals(copyTo)) { + createManifest(); + } + + myFixture.enableInspections(new GlobalInspectionToolWrapper(inspection)); + final VirtualFile file = myFixture.copyFileToProject(BASE_PATH + getTestName(true) + "." + extension, copyTo); + myFixture.configureFromExistingVirtualFile(file); + myFixture.doHighlighting(); + myFixture.checkHighlighting(true, false, false); + } +} From 8c9d0f03c84a8fed44b8ac5360a8ef191d727793 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Thu, 26 Jan 2012 16:34:03 +0400 Subject: [PATCH 09/28] todo navigation: respect order (IDEA-51997) --- .../lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java | 2 ++ .../src/com/intellij/ide/util/treeView/AbstractTreeUi.java | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java index a0c783cfaf65..156ee77bd161 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoTreeBuilder.java @@ -539,6 +539,7 @@ public abstract class TodoTreeBuilder extends AbstractTreeBuilder { return null; } Object[] children = getTreeStructure().getChildElements(parent); + Arrays.sort(children, getUi().getNodeDescriptorComparator()); int idx = -1; for (int i = 0; i < children.length; i++) { if (obj.equals(children[i])) { @@ -584,6 +585,7 @@ public abstract class TodoTreeBuilder extends AbstractTreeBuilder { return null; } Object[] children = getTreeStructure().getChildElements(parent); + Arrays.sort(children, getUi().getNodeDescriptorComparator()); int idx = -1; for (int i = 0; i < children.length; i++) { if (obj.equals(children[i])) { diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java index 6997d30dbed7..ced3ab62d05d 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java @@ -3570,6 +3570,10 @@ public class AbstractTreeUi { } } + public Comparator getNodeDescriptorComparator() { + return myNodeDescriptorComparator; + } + private void disposeNode(DefaultMutableTreeNode node) { TreeNode parent = node.getParent(); if (parent instanceof DefaultMutableTreeNode) { From 35daf8f2916ae7f506bf81861879620fd829e990 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 26 Jan 2012 11:54:30 +0100 Subject: [PATCH 10/28] workaround action update after project closing --- .../platform-impl/src/com/intellij/notification/EventLog.java | 1 + 1 file changed, 1 insertion(+) diff --git a/platform/platform-impl/src/com/intellij/notification/EventLog.java b/platform/platform-impl/src/com/intellij/notification/EventLog.java index 24552d8947ce..e9bd51dfb527 100644 --- a/platform/platform-impl/src/com/intellij/notification/EventLog.java +++ b/platform/platform-impl/src/com/intellij/notification/EventLog.java @@ -329,6 +329,7 @@ public class EventLog implements Notifications { group.add(new DumbAwareAction("Mark all as read", "Mark all unread notifications as read", IconLoader.getIcon("/general/reset.png")) { @Override public void update(AnActionEvent e) { + if (project.isDisposed()) return; e.getPresentation().setEnabled(!getProjectComponent(project).myProjectModel.getNotifications().isEmpty()); } From fa6b7b350b123658377c211479e48e68f1f3fa5e Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 26 Jan 2012 12:05:01 +0100 Subject: [PATCH 11/28] IDEA-80378 Event Log:   is not replaced in text --- .../com/intellij/notification/EventLog.java | 1 + .../intellij/notification/EventLogTest.groovy | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy diff --git a/platform/platform-impl/src/com/intellij/notification/EventLog.java b/platform/platform-impl/src/com/intellij/notification/EventLog.java index e9bd51dfb527..2d1e660c2c6d 100644 --- a/platform/platform-impl/src/com/intellij/notification/EventLog.java +++ b/platform/platform-impl/src/com/intellij/notification/EventLog.java @@ -133,6 +133,7 @@ public class EventLog implements Notifications { mainText += content; } + mainText = StringUtil.replace(mainText, " ", " "); int nlIndex = eolIndex(mainText); if (nlIndex >= 0) { mainText = mainText.substring(0, nlIndex); diff --git a/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy b/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy new file mode 100644 index 000000000000..f0ac1b26be4c --- /dev/null +++ b/platform/platform-tests/testSrc/com/intellij/notification/EventLogTest.groovy @@ -0,0 +1,30 @@ +/* + * Copyright 2000-2012 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.notification; + +import com.intellij.testFramework.UsefulTestCase; + +/** + * @author peter + */ +class EventLogTest extends UsefulTestCase { + + public void testNbsp() { + def entry = EventLog.formatForLog(new Notification("xxx", "Title", "Hello world", NotificationType.ERROR)) + assert entry.message == 'Title: Hello world' + } + +} From d7dadda142d260e6ec65bc2f39ceba6031fb0152 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 26 Jan 2012 13:43:05 +0100 Subject: [PATCH 12/28] IDEA-80379 Perforce: UOE at com.intellij.openapi.vcs.rollback.DefaultRollbackEnvironment.rollbackModifiedWithoutCheckout --- .../src/com/intellij/openapi/vcs/VcsVFSListener.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java index dbf307d0134e..9c2c9a0d03b1 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsVFSListener.java @@ -223,7 +223,7 @@ public abstract class VcsVFSListener implements Disposable { getSingleFileDeletePromptTemplate(), myRemoveOption); } - protected void beforeContentsChange(VirtualFile file) { + protected void beforeContentsChange(VirtualFileEvent event, VirtualFile file) { } private void addFileToMove(final VirtualFile file, final String newParentPath, final String newName) { @@ -378,10 +378,8 @@ public abstract class VcsVFSListener implements Disposable { @Override public void beforeContentsChange(VirtualFileEvent event) { - if (!isEventIgnored(event, false)) { - assert !event.getFile().isDirectory(); - VcsVFSListener.this.beforeContentsChange(event.getFile()); - } + assert !event.getFile().isDirectory(); + VcsVFSListener.this.beforeContentsChange(event, event.getFile()); } } From 0c3ac45cc2bbd50d185d4f1043aecceef7fde83e Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 26 Jan 2012 13:44:51 +0100 Subject: [PATCH 13/28] IDEA-80382 Notifications: when balloon is shown in Event Log and after clicking a link it expires, it should be hidden --- .../src/com/intellij/notification/Notification.java | 6 +++++- .../src/com/intellij/notification/EventLog.java | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/platform/platform-api/src/com/intellij/notification/Notification.java b/platform/platform-api/src/com/intellij/notification/Notification.java index 91c23432ba70..b264b20d1c3c 100644 --- a/platform/platform-api/src/com/intellij/notification/Notification.java +++ b/platform/platform-api/src/com/intellij/notification/Notification.java @@ -97,6 +97,11 @@ public class Notification { public void expire() { NotificationsManager.getNotificationsManager().expire(this); + hideBalloon(); + myExpired = true; + } + + public void hideBalloon() { if (myBalloonRef != null) { final Balloon balloon = myBalloonRef.get(); if (balloon != null) { @@ -104,7 +109,6 @@ public class Notification { } myBalloonRef = null; } - myExpired = true; } public void setBalloon(@Nullable final Balloon balloon) { diff --git a/platform/platform-impl/src/com/intellij/notification/EventLog.java b/platform/platform-impl/src/com/intellij/notification/EventLog.java index 2d1e660c2c6d..79d6ad266bea 100644 --- a/platform/platform-impl/src/com/intellij/notification/EventLog.java +++ b/platform/platform-impl/src/com/intellij/notification/EventLog.java @@ -415,6 +415,8 @@ public class EventLog implements Notifications { Balloon balloon = NotificationsManagerImpl.createBalloon(myNotification, true, true); Disposer.register(project, balloon); balloon.show(target, Balloon.Position.above); + myNotification.hideBalloon(); + myNotification.setBalloon(balloon); } } From 713c8e25e280cd3940630d37fc15ab2af56aab14 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Thu, 26 Jan 2012 16:48:07 +0400 Subject: [PATCH 14/28] Correct permissions for copies of executable files --- .../util/src/com/intellij/openapi/util/io/FileUtil.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java index a47df50805c8..3ed50898fc01 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 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. @@ -678,9 +678,10 @@ public class FileUtil { } if (SystemInfo.isUnix && fromFile.canExecute()) { - final int permissions = FileSystemUtil.getPermissions(fromFile); - if (permissions != -1) { - FileSystemUtil.setPermissions(toFile, permissions); + final int oldPermissions = FileSystemUtil.getPermissions(fromFile); + final int newPermissions = FileSystemUtil.getPermissions(toFile); + if (oldPermissions != -1 && newPermissions != -1) { + FileSystemUtil.setPermissions(toFile, (oldPermissions | newPermissions)); } } } From 97cdf4ce8eede2d26de00b1be437c79ad8ed8aa1 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Thu, 26 Jan 2012 16:55:57 +0400 Subject: [PATCH 15/28] moved tests to community --- .../FileDocumentManagerImplTest.java | 580 +++++++++++++++ .../fileEditor/IdeDocumentHistoryTest.java | 210 ++++++ .../openapi/fileEditor/LoadTextUtilTest.java | 37 + .../src/com/intellij/mock/Mock.java | 681 ++++++++++++++++++ .../intellij/mock/MockCommandProcessor.java | 104 +++ .../com/intellij/mock/MockVirtualFile.java | 70 +- 6 files changed, 1671 insertions(+), 11 deletions(-) create mode 100644 platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileDocumentManagerImplTest.java create mode 100644 platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/IdeDocumentHistoryTest.java create mode 100644 platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/LoadTextUtilTest.java create mode 100644 platform/testFramework/src/com/intellij/mock/Mock.java create mode 100644 platform/testFramework/src/com/intellij/mock/MockCommandProcessor.java diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileDocumentManagerImplTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileDocumentManagerImplTest.java new file mode 100644 index 000000000000..baed1c53c602 --- /dev/null +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/FileDocumentManagerImplTest.java @@ -0,0 +1,580 @@ +package com.intellij.openapi.fileEditor; + +import com.intellij.codeStyle.CodeStyleFacade; +import com.intellij.codeStyle.DefaultCodeStyleFacade; +import com.intellij.mock.MockCommandProcessor; +import com.intellij.mock.MockEditorFactory; +import com.intellij.mock.MockVirtualFile; +import com.intellij.mock.MockVirtualFileManager; +import com.intellij.openapi.command.CommandProcessor; +import com.intellij.openapi.command.UndoConfirmationPolicy; +import com.intellij.openapi.editor.Document; +import com.intellij.openapi.editor.EditorFactory; +import com.intellij.openapi.editor.ex.DocumentEx; +import com.intellij.openapi.fileEditor.impl.FileDocumentManagerImpl; +import com.intellij.openapi.fileTypes.*; +import com.intellij.openapi.fileTypes.impl.FileTypeManagerImpl; +import com.intellij.openapi.fileTypes.impl.InternalFileTypeFactory; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.project.ProjectLocator; +import com.intellij.openapi.project.impl.DefaultProjectLocator; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.vfs.VirtualFileEvent; +import com.intellij.testFramework.MockSchemesManagerFactory; +import com.intellij.testFramework.PlatformLiteFixture; +import com.intellij.util.LocalTimeCounter; +import org.jetbrains.annotations.NotNull; + +import java.io.CharArrayWriter; +import java.io.IOException; +import java.io.OutputStream; +import java.io.Writer; +import java.util.Arrays; + +public class FileDocumentManagerImplTest extends PlatformLiteFixture { + private MyFileDocumentManagerImpl myDocumentManager; + + @Override + protected void setUp() throws Exception { + super.setUp(); + initApplication(); + registerExtension(FileTypeFactory.FILE_TYPE_FACTORY_EP, new InternalFileTypeFactory()); + registerExtensionPoint(FileDocumentSynchronizationVetoer.EP_NAME, FileDocumentSynchronizationVetoer.class); + getApplication().registerService(CommandProcessor.class, new MyMockCommandProcessor()); + getApplication().registerService(CodeStyleFacade.class, new DefaultCodeStyleFacade()); + getApplication().registerService(ProjectLocator.class, new DefaultProjectLocator()); + + MockEditorFactory editorFactory = new MockEditorFactory(); + getApplication().registerService(EditorFactory.class, editorFactory); + final LanguageFileType[] fileType = {null}; + getApplication().addComponent(FileTypeManager.class, new FileTypeManagerImpl(null, new MockSchemesManagerFactory()){ + @NotNull + @Override + public FileType getFileTypeByFileName(@NotNull String fileName) { + return fileType[0]; + } + + @NotNull + @Override + public FileType getFileTypeByFile(@NotNull VirtualFile file) { + return fileType[0]; + } + + @NotNull + @Override + public FileType getFileTypeByExtension(@NotNull String extension) { + return fileType[0]; + } + }); + + fileType[0] = StdFileTypes.JAVA; + + getApplication().getComponent(FileTypeManager.class); + myDocumentManager = new MyFileDocumentManagerImpl(); + getApplication().registerService(FileDocumentManager.class, myDocumentManager); + } + + public void testGetCachedDocument_Cached() throws Exception { + final Document cachedDocument = myDocumentManager.getCachedDocument(new MockVirtualFile("test.txt")); + assertNull(cachedDocument); + } + + public void testGetCachedDocument_NotCached() throws Exception { + final VirtualFile file = newTextFile(); + final Document document = myDocumentManager.getDocument(file); + + assertSame(myDocumentManager.getCachedDocument(file), document); + } + + public void testGetDocument_CreateNew() throws Exception { + final VirtualFile file = newTextFile(); + final Document document = myDocumentManager.getDocument(file); + assertNotNull(document); + assertEquals("test", document.getText()); + assertEquals(file.getModificationStamp(), document.getModificationStamp()); + assertEquals(file.isWritable(), document.isWritable()); + } + + public void testGetDocument_CreateNew_ReadOnly() throws Exception { + final MockVirtualFile file = newTextFile(); + file.setWritable(false); + final Document document = myDocumentManager.getDocument(file); + assertNotNull(document); + assertEquals("test", document.getText()); + assertEquals(file.getModificationStamp(), document.getModificationStamp()); + assertEquals(file.isWritable(), document.isWritable()); + } + + public void testGetDocument_ReturnCachedValueTwice() throws Exception { + final VirtualFile file = newTextFile(); + final Document document = myDocumentManager.getDocument(file); + assertNotNull(document); + assertEquals("test", document.getText()); + + final Document document2 = myDocumentManager.getDocument(file); + assertSame(document2, document); + } + + public void testGetDocument_CreatesNewAfterGced() throws Exception { + final VirtualFile file = newTextFile(); + Document document = myDocumentManager.getDocument(file); + int idCode = System.identityHashCode(document); + //noinspection UnusedAssignment + document = null; + + System.gc(); + System.gc(); + + document = myDocumentManager.getDocument(file); + assertTrue(idCode != System.identityHashCode(document)); + } + + public void testGetUnsavedDocuments_NoDocuments() throws Exception { + final Document[] unsavedDocuments = myDocumentManager.getUnsavedDocuments(); + assertEquals(0, unsavedDocuments.length); + } + + public void testGetUnsavedDocuments_CreatedDocument() throws Exception { + final VirtualFile file = newTextFile(); + myDocumentManager.getDocument(file); + + final Document[] unsavedDocuments = myDocumentManager.getUnsavedDocuments(); + assertEquals(0, unsavedDocuments.length); + } + + public void testGetUnsavedDocuments_ModifiedDocument() throws Exception { + final VirtualFile file = newTextFile(); + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "xxx"); + + final Document[] unsavedDocuments = myDocumentManager.getUnsavedDocuments(); + assertEquals(1, unsavedDocuments.length); + assertSame(document, unsavedDocuments[0]); + assertTrue(Arrays.equals("test".getBytes(), file.contentsToByteArray())); + } + + public void testGetUnsavedDocuments_afterSaveAllDocuments() throws Exception { + final VirtualFile file = newTextFile(); + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "xxx"); + + myDocumentManager.saveAllDocuments(); + final Document[] unsavedDocuments = myDocumentManager.getUnsavedDocuments(); + assertEquals(0, unsavedDocuments.length); + } + + public void testGetUnsavedDocuments_afterSaveDocuments() throws Exception { + final VirtualFile file = newTextFile(); + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "xxx"); + + myDocumentManager.saveDocument(document); + final Document[] unsavedDocuments = myDocumentManager.getUnsavedDocuments(); + assertEquals(0, unsavedDocuments.length); + } + + private static MockVirtualFile newTextFile() { + return new MockVirtualFile("test.txt", "test"); + } + + public void testGetUnsavedDocuments_afterSaveDocumentWithProblems() throws Exception { + final VirtualFile file = new MockVirtualFile("test.txt", "test") { + @Override + @NotNull + public OutputStream getOutputStream(Object requestor, long newModificationStamp, long newTimeStamp) throws IOException { + throw new IOException(""); + } + }; + + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "xxx"); + + myDocumentManager.saveDocument(document); + + assertNotNull(myDocumentManager.myExceptionOnSave); + + final Document[] unsavedDocuments = myDocumentManager.getUnsavedDocuments(); + assertEquals(1, unsavedDocuments.length); + assertSame(document, unsavedDocuments[0]); + assertTrue(Arrays.equals("test".getBytes(), file.contentsToByteArray())); + } + + public void testUnsavedDocument_DontGc() throws Exception { + final VirtualFile file = newTextFile(); + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "xxx"); + int idCode = System.identityHashCode(document); + //noinspection UnusedAssignment + document = null; + + System.gc(); + System.gc(); + + document = myDocumentManager.getDocument(file); + assertEquals(idCode, System.identityHashCode(document)); + } + + public void testUnsavedDocument_GcAfterSave() throws Exception { + final VirtualFile file = newTextFile(); + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "xxx"); + int idCode = System.identityHashCode(document); + //noinspection UnusedAssignment + document = null; + + myDocumentManager.saveAllDocuments(); + + System.gc(); + System.gc(); + + document = myDocumentManager.getDocument(file); + assertTrue(idCode != System.identityHashCode(document)); + } + + public void testSaveDocument_DocumentWasntChanged() throws Exception { + final VirtualFile file = newTextFile(); + final long stamp = file.getModificationStamp(); + Document document = myDocumentManager.getDocument(file); + myDocumentManager.saveDocument(document); + assertEquals(stamp, file.getModificationStamp()); + } + + public void testSaveDocument_DocumentWasChanged() throws Exception { + final VirtualFile file = newTextFile(); + final long stamp = file.getModificationStamp(); + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "xxx"); + + myDocumentManager.saveDocument(document); + assertTrue(stamp != file.getModificationStamp()); + assertEquals(document.getModificationStamp(), file.getModificationStamp()); + assertTrue(Arrays.equals("xxxtest".getBytes(), file.contentsToByteArray())); + } + + public void testSaveAllDocuments_DocumentWasChanged() throws Exception { + final VirtualFile file = newTextFile(); + final long stamp = file.getModificationStamp(); + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "xxx"); + + myDocumentManager.saveAllDocuments(); + assertTrue(stamp != file.getModificationStamp()); + assertTrue(Arrays.equals("xxxtest".getBytes(), file.contentsToByteArray())); + } + + public void testGetFile() throws Exception { + final VirtualFile file = newTextFile(); + Document document = myDocumentManager.getDocument(file); + assertSame(file, myDocumentManager.getFile(document)); + } + + public void testConvertSeparators() throws Exception { + final VirtualFile file = new MockVirtualFile("test.txt", "test\rtest"); + Document document = myDocumentManager.getDocument(file); + assertEquals("test\ntest", document.getText()); + } + + public void testRememberSeparators() throws Exception { + final VirtualFile file = new MockVirtualFile("test.txt", "test\rtest"); + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "xxx"); + myDocumentManager.saveAllDocuments(); + assertTrue(Arrays.equals("xxxtest\rtest".getBytes(), file.contentsToByteArray())); + } + + public void testContentChanged_noDocument() throws Exception { + final MockVirtualFile file = new MockVirtualFile("test.txt", "test\rtest"); + file.setListener(myDocumentManager); + file.setContent(null, "xxx", true); + assertNull(myDocumentManager.getCachedDocument(file)); + } + + public void testContentChanged_documentPresent() throws Exception { + final MockVirtualFile file = new MockVirtualFile("test.txt", "test\rtest"); + file.setListener(myDocumentManager); + Document document = myDocumentManager.getDocument(file); + file.setContent(null, "xxx", true); + assertEquals("xxx", document.getText()); + assertEquals(file.getModificationStamp(), document.getModificationStamp()); + } + + public void testContentChanged_ignoreEventsFromSelf() throws Exception { + final MockVirtualFile file = new MockVirtualFile("test.txt", "test\rtest"); + file.setListener(myDocumentManager); + Document document = myDocumentManager.getDocument(file); + file.setContent(myDocumentManager, "xxx", true); + assertEquals("test\ntest", document.getText()); + } + + public void testContentChanged_ignoreEventsFromSelfOnSave() throws Exception { + final VirtualFile file = new MockVirtualFile("test.txt", "test\rtest") { + public Writer getWriter(final Object requestor, final long newModificationStamp) { + final VirtualFile self = this; + return new CharArrayWriter() { + @Override + public void close() { + super.close(); + long oldStamp = getModificationStamp(); + setModificationStamp(newModificationStamp); + setText(toString()); + myDocumentManager.contentsChanged(new VirtualFileEvent(requestor, self, null, oldStamp, getModificationStamp())); + } + }; + } + }; + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "xxx"); + final long stamp = document.getModificationStamp(); + + myDocumentManager.saveAllDocuments(); + assertEquals(stamp, document.getModificationStamp()); + } + + public void testContentChanged_reloadChangedDocument() throws Exception { + final MockVirtualFile file = new MockVirtualFile("test.txt", "test\rtest"); + file.setListener(myDocumentManager); + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "zzz"); + + myDocumentManager.myReloadFromDisk = Boolean.TRUE; + try { + file.setContent(null, "xxx", true); + + assertEquals("xxx", document.getText()); + assertEquals(file.getModificationStamp(), document.getModificationStamp()); + assertEquals(0, myDocumentManager.getUnsavedDocuments().length); + } + finally { + myDocumentManager.myReloadFromDisk = null; + } + } + + public void testContentChanged_dontreloadChangedDocument() throws Exception { + final MockVirtualFile file = newTextFile(); + file.setListener(myDocumentManager); + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "zzz"); + + myDocumentManager.myReloadFromDisk = Boolean.FALSE; + try { + long oldDocumentStamp = document.getModificationStamp(); + + file.setContent(null, "xxx", true); + + assertEquals("zzztest", document.getText()); + assertEquals(oldDocumentStamp, document.getModificationStamp()); + } + finally { + myDocumentManager.myReloadFromDisk = null; + } + } + + public void testSaveDocument_dontSaveIfModStampEqualsToFile() throws Exception { + final VirtualFile file = new MockVirtualFile("test.txt", "test") { + @NotNull + @Override + public OutputStream getOutputStream(Object requestor, long newModificationStamp, long newTimeStamp) throws IOException { + fail(); + throw new IOException(); + } + }; + DocumentEx document = (DocumentEx)myDocumentManager.getDocument(file); + document.insertString(0, "zzz"); + document.setModificationStamp(file.getModificationStamp()); + + myDocumentManager.saveDocument(document); + } + + // this test requires changes in idea code to support MockFile as local file system file (FileDocumentManager.needsRefresh). + // TODO: think how to test this functionality without hacking production code + public void atestContentChanged_reloadChangedDocumentOnSave() throws Exception { + final MockVirtualFile file = new MockVirtualFile("test.txt", "test\rtest") { + @Override + public void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable) { + long oldStamp = getModificationStamp(); + setModificationStamp(LocalTimeCounter.currentTime()); + myDocumentManager.contentsChanged(new VirtualFileEvent(null, this, null, oldStamp, getModificationStamp())); + } + }; + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "zzz"); + file.setContent(null, "xxx", false); + + myDocumentManager.myReloadFromDisk = Boolean.TRUE; + try { + file.setActualTimeStamp(file.getTimeStamp() + 1); + myDocumentManager.saveAllDocuments(); + long fileStamp = file.getModificationStamp(); + + assertEquals("xxx", document.getText()); + assertEquals(file.getModificationStamp(), document.getModificationStamp()); + assertEquals(file.getModificationStamp(), fileStamp); + assertEquals(0, myDocumentManager.getUnsavedDocuments().length); + } + finally { + myDocumentManager.myReloadFromDisk = null; + } + } + + public void testContentChanged_dontreloadChangedDocumentOnSave() throws Exception { + final MockVirtualFile file = new MockVirtualFile("test.txt", "test") { + @Override + public void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable) { + long oldStamp = getModificationStamp(); + setModificationStamp(LocalTimeCounter.currentTime()); + myDocumentManager.contentsChanged(new VirtualFileEvent(null, this, null, oldStamp, getModificationStamp())); + } + }; + + myDocumentManager.myReloadFromDisk = Boolean.FALSE; + try { + Document document = myDocumentManager.getDocument(file); + document.insertString(0, "zzz"); + long documentStamp = document.getModificationStamp(); + + file.setContent(null, "xxx", false); + + file.setActualTimeStamp(file.getTimeStamp() + 1); + myDocumentManager.saveAllDocuments(); + + assertEquals("zzztest", document.getText()); + assertEquals(file.getModificationStamp(), document.getModificationStamp()); + assertTrue(Arrays.equals("zzztest".getBytes(), file.contentsToByteArray())); + assertEquals(documentStamp, document.getModificationStamp()); + } + finally { + myDocumentManager.myReloadFromDisk = null; + } + } + + public void testReplaceDocumentTestWithTheSameTest() throws Exception { + final boolean[] canCallSave = {true}; + final VirtualFile file = new MockVirtualFile("test.txt", "test") { + @NotNull + @Override + public OutputStream getOutputStream(Object requestor, long newModificationStamp, long newTimeStamp) throws IOException { + if (!canCallSave[0]) fail(); + return super.getOutputStream(requestor, newModificationStamp, newTimeStamp); + } + }; + DocumentEx document = (DocumentEx)myDocumentManager.getDocument(file); + + String newText = "test text"; + document.replaceString(0, document.getTextLength(), newText); + assertTrue(myDocumentManager.isDocumentUnsaved(document)); + myDocumentManager.saveDocument(document); + + canCallSave[0] = false; + + final long modificationStamp = document.getModificationStamp(); + + document.replaceString(0, document.getTextLength(), newText); + + if (myDocumentManager.isDocumentUnsaved(document)) { + assertTrue(document.getModificationStamp() > modificationStamp); + } + else { + assertEquals(modificationStamp, document.getModificationStamp()); + } + } + + + public void testExternalReplaceWithTheSameText() throws Exception{ + final long[] modificationStamp = new long[1]; + + modificationStamp[0] = 1; + + final VirtualFile file = new MockVirtualFile("test.txt", "test") { + @NotNull + @Override + public OutputStream getOutputStream(Object requestor, long newModificationStamp, long newTimeStamp) throws IOException { + fail(); + throw new IOException(); + } + + @Override + public long getModificationStamp() { + return modificationStamp[0]; + } + + @Override + public void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable) { + myDocumentManager.contentsChanged(new VirtualFileEvent(null, this, null, 1, 2)); + + } + }; + DocumentEx document = (DocumentEx)myDocumentManager.getDocument(file); + + + modificationStamp[0] = 2; + + file.refresh(false, false); + + assertEquals(2, document.getModificationStamp()); + } + + public static class MyFileDocumentManagerImpl extends FileDocumentManagerImpl { + + public static final FileDocumentManagerListener[] LISTENERS = new FileDocumentManagerListener[0]; + + public IOException myExceptionOnSave; + public Boolean myReloadFromDisk = null; + + public MyFileDocumentManagerImpl() { + super(new MockVirtualFileManager()); + } + + @Override + protected void reportErrorOnSave(IOException e) { + myExceptionOnSave = e; + } + + @Override + protected boolean askReloadFromDisk(VirtualFile file, Document document) { + if (myReloadFromDisk == null){ + fail(); + return false; + } + else{ + return myReloadFromDisk.booleanValue(); + } + } + + @NotNull + @Override + protected FileDocumentManagerListener[] getListeners() { + return LISTENERS; + } + } + + private static class MyMockCommandProcessor extends MockCommandProcessor { + @Override + public void executeCommand(Project project, @NotNull Runnable runnable, String name, Object groupId) { + runnable.run(); + } + + @Override + public void executeCommand(Project project, + @NotNull Runnable runnable, + String name, + Object groupId, + @NotNull UndoConfirmationPolicy confirmationPolicy, + Document document) { + runnable.run(); + } + + @Override + public void executeCommand(Project project, + @NotNull Runnable runnable, + String name, + Object groupId, + @NotNull UndoConfirmationPolicy confirmationPolicy) { + runnable.run(); + } + + @Override + public void executeCommand(@NotNull Runnable runnable, String name, Object groupId) { + runnable.run(); + } + } +} diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/IdeDocumentHistoryTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/IdeDocumentHistoryTest.java new file mode 100644 index 000000000000..04264ccb9df3 --- /dev/null +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/IdeDocumentHistoryTest.java @@ -0,0 +1,210 @@ +package com.intellij.openapi.fileEditor; + +import com.intellij.mock.Mock; +import com.intellij.openapi.command.CommandProcessor; +import com.intellij.openapi.editor.EditorFactory; +import com.intellij.openapi.fileEditor.impl.IdeDocumentHistoryImpl; +import com.intellij.openapi.util.Pair; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.vfs.VirtualFileManager; +import com.intellij.testFramework.PlatformTestCase; +import org.jetbrains.annotations.NotNull; + +public class IdeDocumentHistoryTest extends PlatformTestCase { + private IdeDocumentHistoryImpl myHistory; + + private Mock.MyFileEditor mySelectedEditor; + private Mock.MyVirtualFile mySelectedFile; + private FileEditorState myEditorState; + private FileEditorProvider myProvider; + + private MyState myState1; + private MyState myState2; + private MyState myState3; + + @Override + protected void setUp() throws Exception { + super.setUp(); + myHistory = new IdeDocumentHistoryImpl(getProject(), EditorFactory.getInstance(), new EditorManager(), VirtualFileManager.getInstance(), CommandProcessor.getInstance(), new Mock.MyToolWindowManager()) { + @Override + protected Pair getSelectedEditor() { + return Pair.create ((FileEditor)mySelectedEditor, myProvider); + } + + @Override + protected void executeCommand(Runnable runnable, String name, Object groupId) { + myHistory.onCommandStarted(); + runnable.run(); + myHistory.onSelectionChanged(); + myHistory.onCommandFinished(groupId); + } + }; + + mySelectedEditor = new Mock.MyFileEditor() { + @Override + @NotNull + public FileEditorState getState(@NotNull FileEditorStateLevel level) { + return myEditorState; + } + + @Override + public void setState(@NotNull FileEditorState state) { + myEditorState = state; + } + }; + mySelectedFile = new Mock.MyVirtualFile(); + myEditorState = new MyState(false, "start"); + myProvider = new Mock.MyFileEditorProvider() { + @Override + @NotNull + public String getEditorTypeId() { + return "EditorType"; + } + }; + } + public void testNoHistoryRecording() throws Throwable { + myHistory.onCommandStarted(); + myHistory.onCommandFinished(null); + + assertFalse(myHistory.isBackAvailable()); + assertFalse(myHistory.isForwardAvailable()); + } + + public void testNavigationRecording() throws Throwable { + makeNavigationChange(myState2); + + assertTrue(myHistory.isBackAvailable()); + assertFalse(myHistory.isForwardAvailable()); + + assertEquals(1, myHistory.getBackPlaces().size()); + } + + public void testMergingForwardPlaces() throws Throwable { + myEditorState = new MyState(true, "state1"); + makeNavigationChange(new MyState(true, "state2")); + + assertTrue(myHistory.isBackAvailable()); + assertFalse(myHistory.isForwardAvailable()); + + assertEquals(1, myHistory.getBackPlaces().size()); + } + + public void testSimpleNavigation() throws Throwable { + pushTwoStates(); + + assertFalse(myHistory.isForwardAvailable()); + assertTrue(myHistory.isBackAvailable()); + + myHistory.back(); + assertTrue(myHistory.isBackAvailable()); + assertTrue(myHistory.isForwardAvailable()); + assertSame(myState2, myEditorState); + + myHistory.back(); + assertFalse(myHistory.isBackAvailable()); + assertTrue(myHistory.isForwardAvailable()); + assertSame(myState1, myEditorState); + + myHistory.forward(); + assertTrue(myHistory.isBackAvailable()); + assertTrue(myHistory.isForwardAvailable()); + assertSame(myState2, myEditorState); + + myHistory.forward(); + assertTrue(myHistory.isBackAvailable()); + assertFalse(myHistory.isForwardAvailable()); + assertSame(myState3, myEditorState); + } + + public void testQueueCutOff() throws Throwable { + pushTwoStates(); + myHistory.back(); + + assertTrue(myHistory.isBackAvailable()); + assertTrue(myHistory.isForwardAvailable()); + + MyState newState = new MyState(false, "newState"); + makeNavigationChange(newState); + + assertTrue(myHistory.isBackAvailable()); + assertFalse(myHistory.isForwardAvailable()); + + myHistory.back(); + assertSame(myState2, myEditorState); + myHistory.back(); + assertSame(myState1, myEditorState); + assertFalse(myHistory.isBackAvailable()); + } + + public void testRemoveInvalid() throws Throwable { + pushTwoStates(); + assertTrue(myHistory.isBackAvailable()); + + mySelectedFile.myValid = false; + + myHistory.onFileDeleted(); + + assertFalse(myHistory.isBackAvailable()); + assertFalse(myHistory.isForwardAvailable()); + } + + + private void pushTwoStates() { + myState1 = new MyState(false, "state1"); + myState2 = new MyState(false, "state2"); + myState3 = new MyState(false, "state3"); + + myEditorState = myState1; + makeNavigationChange(myState2); + makeNavigationChange(myState3); + } + + private void makeNavigationChange(MyState newState) { + myHistory.onCommandStarted(); + myHistory.onSelectionChanged(); + myHistory.onCommandFinished(null); + myEditorState = newState; + } + + private class EditorManager extends Mock.MyFileEditorManager { + + @Override + public VirtualFile getFile(@NotNull FileEditor editor) { + return mySelectedFile; + } + + @Override + @NotNull + public Pair openFileWithProviders(@NotNull VirtualFile file, + boolean focusEditor, + boolean searchForSplitter) { + return Pair.create (new FileEditor[] {mySelectedEditor}, new FileEditorProvider[] {myProvider}); + } + + @Override + public FileEditorProvider getProvider(FileEditor editor) { + return myProvider; + } + } + + private static class MyState implements FileEditorState { + + private final boolean myCanBeMerged; + private final String myName; + + public MyState(boolean canBeMerged, String name) { + myCanBeMerged = canBeMerged; + myName = name; + } + + @Override + public boolean canBeMergedWith(FileEditorState otherState, FileEditorStateLevel level) { + return myCanBeMerged; + } + + public String toString() { + return myName; + } + } + +} diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/LoadTextUtilTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/LoadTextUtilTest.java new file mode 100644 index 000000000000..74ead6c532b8 --- /dev/null +++ b/platform/platform-tests/testSrc/com/intellij/openapi/fileEditor/LoadTextUtilTest.java @@ -0,0 +1,37 @@ +package com.intellij.openapi.fileEditor; + +import com.intellij.openapi.fileEditor.impl.LoadTextUtil; +import com.intellij.openapi.util.Comparing; +import com.intellij.testFramework.LightPlatformTestCase; +import com.intellij.testFramework.LightVirtualFile; + +public class LoadTextUtilTest extends LightPlatformTestCase { + private static void doTest(String source, String expected, String expectedSeparator) { + final LightVirtualFile vFile = new LightVirtualFile("test.txt"); + final CharSequence real = LoadTextUtil.getTextByBinaryPresentation(source.getBytes(), vFile); + assertTrue("content", Comparing.equal(expected, real)); + if (expectedSeparator != null) { + assertEquals("detected line separator", expectedSeparator, FileDocumentManager.getInstance().getLineSeparator(vFile, null)); + } + } + + public void testSimpleLoad() { + doTest("test", "test", null); + } + + public void testConvert_SlashR() { + doTest("test\rtest\rtest", "test\ntest\ntest", "\r"); + } + + public void testConvert_SlashN() { + doTest("test\ntest\ntest", "test\ntest\ntest", "\n"); + } + + public void testConvert_SlashR_SlashN() { + doTest("test\r\ntest\r\ntest", "test\ntest\ntest", "\r\n"); + } + + public void testConvertMostCommon() { + doTest("test\r\ntest\r\ntest\ntest", "test\ntest\ntest\ntest", "\r\n"); + } +} diff --git a/platform/testFramework/src/com/intellij/mock/Mock.java b/platform/testFramework/src/com/intellij/mock/Mock.java new file mode 100644 index 000000000000..74c68d273eb0 --- /dev/null +++ b/platform/testFramework/src/com/intellij/mock/Mock.java @@ -0,0 +1,681 @@ +package com.intellij.mock; + +import com.intellij.codeHighlighting.BackgroundEditorHighlighter; +import com.intellij.ide.structureView.StructureViewBuilder; +import com.intellij.openapi.Disposable; +import com.intellij.openapi.editor.Document; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.fileEditor.*; +import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx; +import com.intellij.openapi.fileEditor.impl.EditorComposite; +import com.intellij.openapi.fileEditor.impl.EditorWindow; +import com.intellij.openapi.fileEditor.impl.EditorsSplitters; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.MessageType; +import com.intellij.openapi.ui.popup.Balloon; +import com.intellij.openapi.util.*; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.vfs.VirtualFileSystem; +import com.intellij.openapi.wm.IdeFocusManager; +import com.intellij.openapi.wm.ToolWindow; +import com.intellij.openapi.wm.ToolWindowAnchor; +import com.intellij.openapi.wm.ToolWindowManager; +import com.intellij.openapi.wm.impl.IdeFocusManagerHeadless; +import com.intellij.util.ArrayUtil; +import org.jdom.Element; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +import javax.swing.*; +import javax.swing.event.HyperlinkListener; +import java.awt.*; +import java.beans.PropertyChangeListener; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Collections; +import java.util.List; + +//[kirillk] - this class looks to be an overkill but IdeDocumentHistory is highly coupled +// with all of that stuff below, so it's not possible to test it's back/forward capabilities +// w/o making mocks for all of them. perhaps later we will decouple those things +public class Mock { + + public static class MyFileEditor extends UserDataHolderBase implements DocumentsEditor { + public Document[] DOCUMENTS; + + @Override + public Document[] getDocuments() { + return DOCUMENTS; + } + + @Override + @NotNull + public JComponent getComponent() { + throw new UnsupportedOperationException(); + } + + @Override + public JComponent getPreferredFocusedComponent() { + return null; + } + + @Override + @NotNull + public String getName() { + return ""; + } + + @Override + public void dispose() { + } + + @Override + public StructureViewBuilder getStructureViewBuilder() { + return null; + } + + @Override + @NotNull + public FileEditorState getState(@NotNull FileEditorStateLevel level) { + return new FileEditorState() { + @Override + public boolean canBeMergedWith(FileEditorState fileEditorState, FileEditorStateLevel fileEditorStateLevel) { + return false; + } + }; + } + + @Override + public void setState(@NotNull FileEditorState state) { + } + + @Override + public boolean isModified() { + return false; + } + + @Override + public boolean isValid() { + return false; + } + + @Override + public void selectNotify() { + } + + @Override + public void deselectNotify() { + } + + @Override + public void addPropertyChangeListener(@NotNull PropertyChangeListener listener) { + } + + @Override + public void removePropertyChangeListener(@NotNull PropertyChangeListener listener) { + } + + @Override + public BackgroundEditorHighlighter getBackgroundHighlighter() { + return null; + } + + @Override + public FileEditorLocation getCurrentLocation() { + return null; + } + } + + public static class MyFileEditorManager extends FileEditorManagerEx { + @Override + public JComponent getComponent() { + return null; + } + + @Override + public ActionCallback notifyPublisher(Runnable runnable) { + runnable.run(); + return new ActionCallback.Done(); + } + + @Override + public ActionCallback getReady(@NotNull Object requestor) { + return new ActionCallback.Done(); + } + + @NotNull + @Override + public Pair openFileWithProviders(@NotNull VirtualFile file, + boolean focusEditor, + @NotNull EditorWindow window) { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public boolean isInsideChange() { + return false; + } + + @Override + public boolean hasSplitOrUndockedWindows() { + return false; + } + + @Override + public EditorsSplitters getSplittersFor(Component c) { + return null; + } + + @Override + public EditorsSplitters getSplitters() { + return null; + } + + @Override + public AsyncResult getActiveWindow() { + return null; + } + + @Override + public void addTopComponent(@NotNull final FileEditor editor, @NotNull final JComponent component) { + } + + @Override + public void removeTopComponent(@NotNull final FileEditor editor, @NotNull final JComponent component) { + } + + @Override + public void addBottomComponent(@NotNull final FileEditor editor, @NotNull final JComponent component) { + } + + @Override + public void removeBottomComponent(@NotNull final FileEditor editor, @NotNull final JComponent component) { + } + + @Override + public JComponent getPreferredFocusedComponent() { + return null; + } + + @Override + @NotNull + public Pair getEditorsWithProviders(@NotNull VirtualFile file) { + throw new UnsupportedOperationException(); + } + + public FileEditorProvider getProvider(FileEditor editor) { + return null; + } + + @Override + public EditorWindow getCurrentWindow() { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public void setCurrentWindow(EditorWindow window) { + } + + @Override + public VirtualFile getFile(@NotNull FileEditor editor) { + return null; + } + + @Override + public void updateFilePresentation(VirtualFile file) { + } + + @Override + public void unsplitWindow() { + //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public void unsplitAllWindow() { + //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + @NotNull + public EditorWindow[] getWindows() { + return new EditorWindow[0]; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + @NotNull + public VirtualFile[] getSiblings(VirtualFile file) { + return new VirtualFile[0]; + } + + @Override + public void createSplitter(int orientation, @Nullable EditorWindow window) { + //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public void changeSplitterOrientation() { + //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public void flipTabs() { + //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public boolean tabsMode() { + return false; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public boolean isInSplitter() { + return false; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public boolean hasOpenedFile() { + return false; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public VirtualFile getCurrentFile() { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public Pair getSelectedEditorWithProvider(@NotNull VirtualFile file) { + return null; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public boolean isChanged(@NotNull EditorComposite editor) { + return false; //To change body of implemented methods use File | Settings | File Templates. + } + + @Override + public EditorWindow getNextWindow(@NotNull EditorWindow window) { + return null; + } + + @Override + public EditorWindow getPrevWindow(@NotNull EditorWindow window) { + return null; + } + + @Override + public void closeAllFiles() { + } + + public Editor openTextEditorEnsureNoFocus(@NotNull OpenFileDescriptor descriptor) { + return null; + } + + @Override + @NotNull + public Pair openFileWithProviders(@NotNull VirtualFile file, + boolean focusEditor, + boolean searchForSplitter) { + return Pair.create (new FileEditor[0], new FileEditorProvider [0]); + } + + @Override + public void closeFile(@NotNull VirtualFile file) { + } + + @Override + public void closeFile(@NotNull VirtualFile file, @NotNull EditorWindow window) { + } + + @Override + public Editor openTextEditor(OpenFileDescriptor descriptor, boolean focusEditor) { + return null; + } + + @Override + public Editor getSelectedTextEditor() { + return null; + } + + @Override + public boolean isFileOpen(@NotNull VirtualFile file) { + return false; + } + + @Override + @NotNull + public VirtualFile[] getOpenFiles() { + return new VirtualFile[0]; + } + + @Override + @NotNull + public VirtualFile[] getSelectedFiles() { + return new VirtualFile[0]; + } + + @Override + @NotNull + public FileEditor[] getSelectedEditors() { + return new FileEditor[0]; + } + + @Override + public FileEditor getSelectedEditor(@NotNull VirtualFile file) { + return null; + } + + @Override + @NotNull + public FileEditor[] getEditors(@NotNull VirtualFile file) { + return new FileEditor[0]; + } + + @NotNull + @Override + public FileEditor[] getAllEditors(@NotNull VirtualFile file) { + return new FileEditor[0]; + } + + @Override + @NotNull + public FileEditor[] getAllEditors() { + return new FileEditor[0]; + } + + @Override + public void removeEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComoponent) { + } + + @Override + public void showEditorAnnotation(@NotNull FileEditor editor, @NotNull JComponent annotationComoponent) { + } + + @Override + public void addFileEditorManagerListener(@NotNull FileEditorManagerListener listener) { + } + + @Override + public void addFileEditorManagerListener(@NotNull FileEditorManagerListener listener, Disposable parentDisposable) { + } + + @Override + public void removeFileEditorManagerListener(@NotNull FileEditorManagerListener listener) { + } + + @Override + @NotNull + public List openEditor(@NotNull OpenFileDescriptor descriptor, boolean focusEditor) { + return Collections.emptyList(); + } + + @Override + @NotNull + public Project getProject() { + throw new UnsupportedOperationException(); + } + + @Override + public void registerExtraEditorDataProvider(@NotNull EditorDataProvider provider, Disposable parentDisposable) { + } + + @Override + public int getWindowSplitCount() { + return 0; + } + } + + public static class MyVirtualFile extends VirtualFile { + + public boolean myValid = true; + + @Override + @NotNull + public VirtualFileSystem getFileSystem() { + throw new UnsupportedOperationException(); + } + + @Override + public String getPath() { + return null; + } + + @Override + @NotNull + public String getName() { + throw new UnsupportedOperationException(); + } + + @Override + public void rename(Object requestor, @NotNull String newName) throws IOException { + } + + @Override + public boolean isWritable() { + return false; + } + + @Override + public boolean isDirectory() { + return false; + } + + @Override + public boolean isValid() { + return myValid; + } + + @Override + public VirtualFile getParent() { + return null; + } + + @Override + public VirtualFile[] getChildren() { + return new VirtualFile[0]; + } + + @Override + public VirtualFile createChildDirectory(Object requestor, String name) throws IOException { + return null; + } + + @Override + public VirtualFile createChildData(Object requestor, @NotNull String name) throws IOException { + return null; + } + + @Override + public void delete(Object requestor) throws IOException { + } + + @Override + public void move(Object requestor, @NotNull VirtualFile newParent) throws IOException { + } + + @Override + public InputStream getInputStream() throws IOException { + return null; + } + + @Override + @NotNull + public OutputStream getOutputStream(Object requestor, long newModificationStamp, long newTimeStamp) throws IOException { + throw new UnsupportedOperationException(); + } + + @Override + @NotNull + public byte[] contentsToByteArray() throws IOException { + return ArrayUtil.EMPTY_BYTE_ARRAY; + } + + @Override + public long getModificationStamp() { + return 0; + } + + @Override + public long getTimeStamp() { + return 0; + } + + @Override + public long getLength() { + return 0; + } + + @Override + public void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable) { + } + } + + public static class MyToolWindowManager extends ToolWindowManager { + @Override + public ToolWindow registerToolWindow(@NotNull String id, @NotNull JComponent component, @NotNull ToolWindowAnchor anchor) { + return null; + } + + @Override + public ToolWindow registerToolWindow(@NotNull String id, + @NotNull JComponent component, + @NotNull ToolWindowAnchor anchor, + Disposable parentDisposable, + boolean canWorkInDumbMode, boolean canCloseContents) { + return null; + } + + @Override + public ToolWindow registerToolWindow(@NotNull String id, + @NotNull JComponent component, + @NotNull ToolWindowAnchor anchor, + Disposable parentDisposable, + boolean canWorkInDumbMode) { + return null; + } + + @Override + public ToolWindow registerToolWindow(@NotNull String id, @NotNull JComponent component, @NotNull ToolWindowAnchor anchor, Disposable parentDisposable) { + return null; + } + + @Override + public ToolWindow registerToolWindow(@NotNull final String id, final boolean canCloseContent, @NotNull final ToolWindowAnchor anchor) { + return null; + } + + @Override + public ToolWindow registerToolWindow(@NotNull final String id, final boolean canCloseContent, @NotNull final ToolWindowAnchor anchor, + final Disposable parentDisposable, final boolean dumbAware) { + return null; + } + + @Override + public ToolWindow registerToolWindow(@NotNull final String id, final boolean canCloseContent, @NotNull final ToolWindowAnchor anchor, final boolean sideTool) { + return null; + } + + public JComponent getFocusTargetFor(final JComponent comp) { + return null; + } + + @Override + public void unregisterToolWindow(@NotNull String id) { + } + + @Override + public void activateEditorComponent() { + } + + public ActionCallback requestFocus(final Component c, final boolean forced) { + return new ActionCallback.Done(); + } + + public ActionCallback requestFocus(final ActiveRunnable command, final boolean forced) { + return new ActionCallback.Done(); + } + + @Override + public boolean isEditorComponentActive() { + return false; + } + + @Override + public String[] getToolWindowIds() { + return ArrayUtil.EMPTY_STRING_ARRAY; + } + + @Override + public String getActiveToolWindowId() { + return null; + } + + @Override + public ToolWindow getToolWindow(String id) { + return null; + } + + @Override + public void invokeLater(Runnable runnable) { + } + + @Override + public IdeFocusManager getFocusManager() { + return IdeFocusManagerHeadless.INSTANCE; + } + + @Override + public void notifyByBalloon(@NotNull final String toolWindowId, final MessageType type, @NotNull final String text, @Nullable final Icon icon, + @Nullable final HyperlinkListener listener) { + } + + @Override + public Balloon getToolWindowBalloon(String id) { + return null; + } + + @Override + public void notifyByBalloon(@NotNull final String toolWindowId, @NotNull final MessageType type, @NotNull final String htmlBody) { + } + } + + + public static class MyFileEditorProvider implements FileEditorProvider { + @Override + public boolean accept(@NotNull Project project, @NotNull VirtualFile file) { + return false; + } + + @Override + @NotNull + public FileEditor createEditor(@NotNull Project project, @NotNull VirtualFile file) { + throw new UnsupportedOperationException(); + } + + @Override + public void disposeEditor(@NotNull FileEditor editor) { + } + + @Override + @NotNull + public FileEditorState readState(@NotNull Element sourceElement, @NotNull Project project, @NotNull VirtualFile file) { + throw new UnsupportedOperationException(); + } + + @Override + public void writeState(@NotNull FileEditorState state, @NotNull Project project, @NotNull Element targetElement) { + } + + @Override + @NotNull + public String getEditorTypeId() { + throw new UnsupportedOperationException(); + } + + @Override + @NotNull + public FileEditorPolicy getPolicy() { + throw new UnsupportedOperationException(); + } + } +} diff --git a/platform/testFramework/src/com/intellij/mock/MockCommandProcessor.java b/platform/testFramework/src/com/intellij/mock/MockCommandProcessor.java new file mode 100644 index 000000000000..981b97fc25df --- /dev/null +++ b/platform/testFramework/src/com/intellij/mock/MockCommandProcessor.java @@ -0,0 +1,104 @@ +package com.intellij.mock; + +import com.intellij.openapi.Disposable; +import com.intellij.openapi.command.CommandListener; +import com.intellij.openapi.command.CommandProcessor; +import com.intellij.openapi.command.UndoConfirmationPolicy; +import com.intellij.openapi.editor.Document; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public class MockCommandProcessor extends CommandProcessor { + @Override + public void executeCommand(@NotNull Runnable runnable, String name, Object groupId) { + } + + @Override + public void executeCommand(Project project, @NotNull Runnable runnable, String name, Object groupId) { + } + + @Override + public void executeCommand(Project project, + @NotNull Runnable runnable, + String name, + Object groupId, + @NotNull UndoConfirmationPolicy confirmationPolicy) { + + } + + @Override + public void setCurrentCommandName(String name) { + } + + @Override + public void setCurrentCommandGroupId(Object groupId) { + } + + @Override + public Runnable getCurrentCommand() { + return null; + } + + @Override + public String getCurrentCommandName() { + return null; + } + + @Override + @Nullable + public Object getCurrentCommandGroupId() { + return null; + } + + @Override + public Project getCurrentCommandProject() { + return null; + } + + @Override + public void addCommandListener(@NotNull CommandListener listener) { + } + + @Override + public void addCommandListener(@NotNull CommandListener listener, @NotNull Disposable parentDisposable) { + } + + @Override + public void removeCommandListener(@NotNull CommandListener listener) { + } + + @Override + public boolean isUndoTransparentActionInProgress() { + return false; + } + + @Override + public void markCurrentCommandAsGlobal(Project project) { + + } + + @Override + public void runUndoTransparentAction(@NotNull Runnable action) { + } + + @Override + public void executeCommand(Project project, @NotNull Runnable command, String name, Object groupId, @NotNull UndoConfirmationPolicy confirmationPolicy, + Document document) { + } + + @Override + public void executeCommand(Project project, @NotNull Runnable runnable, @Nls String name, Object groupId, @Nullable Document document) { + + } + + @Override + public void addAffectedDocuments(Project project, @NotNull Document... docs) { + } + + @Override + public void addAffectedFiles(Project project, @NotNull VirtualFile... files) { + } +} diff --git a/platform/testFramework/src/com/intellij/mock/MockVirtualFile.java b/platform/testFramework/src/com/intellij/mock/MockVirtualFile.java index 5478d0b84890..4a8ac05d43ff 100644 --- a/platform/testFramework/src/com/intellij/mock/MockVirtualFile.java +++ b/platform/testFramework/src/com/intellij/mock/MockVirtualFile.java @@ -3,15 +3,14 @@ */ package com.intellij.mock; -import com.intellij.openapi.fileTypes.FileType; -import com.intellij.openapi.vfs.VfsUtil; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.vfs.VirtualFileSystem; +import com.intellij.openapi.vfs.*; +import com.intellij.util.LocalTimeCounter; import com.intellij.util.SmartList; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; @@ -26,8 +25,8 @@ public class MockVirtualFile extends VirtualFile { private final boolean myDirectory; private final List myChildren = new SmartList(); private String myText; - private FileType myFileType; private final MockVirtualFileSystem myFileSystem = new MockVirtualFileSystem(); + private long myModStamp = LocalTimeCounter.currentTime(); public MockVirtualFile(final String name) { this(false, name); @@ -38,6 +37,12 @@ public class MockVirtualFile extends VirtualFile { myName = name; } + public MockVirtualFile(String name, String text) { + myName = name; + myText = text; + myDirectory = false; + } + public void setText(final String text) { myText = text; } @@ -73,9 +78,13 @@ public class MockVirtualFile extends VirtualFile { return prefix + "/" + myName; } + private boolean myIsWritable = true; @Override public boolean isWritable() { - throw new UnsupportedOperationException("Method isWritable is not yet implemented in " + getClass().getName()); + return myIsWritable; + } + public void setWritable(boolean b) { + myIsWritable = b; } @Override @@ -96,13 +105,28 @@ public class MockVirtualFile extends VirtualFile { @Override public VirtualFile[] getChildren() { - return (VirtualFile[])VfsUtil.toVirtualFileArray(myChildren); + return VfsUtil.toVirtualFileArray(myChildren); } @Override @NotNull - public OutputStream getOutputStream(Object requestor, long newModificationStamp, long newTimeStamp) throws IOException { - throw new UnsupportedOperationException("Method getOutputStream is not yet implemented in " + getClass().getName()); + public OutputStream getOutputStream(Object requestor, final long newModificationStamp, long newTimeStamp) throws IOException { + return new ByteArrayOutputStream() { + @Override + public void close() { + myModStamp = newModificationStamp; + myText = toString(); + } + }; + } + + @Override + public long getModificationStamp() { + return myModStamp; + } + + public void setModificationStamp(long modStamp) { + myModStamp = modStamp; } @Override @@ -111,9 +135,11 @@ public class MockVirtualFile extends VirtualFile { return myText.getBytes(); } + + private final long myTimeStamp = System.currentTimeMillis(); @Override public long getTimeStamp() { - throw new UnsupportedOperationException("Method getTimeStamp is not yet implemented in " + getClass().getName()); + return myTimeStamp; } @Override @@ -123,7 +149,16 @@ public class MockVirtualFile extends VirtualFile { @Override public void refresh(boolean asynchronous, boolean recursive, Runnable postRunnable) { - throw new UnsupportedOperationException("Method refresh is not yet implemented in " + getClass().getName()); + + } + + private long myActualTimeStamp = myTimeStamp; + public void setActualTimeStamp(long actualTimeStamp) { + myActualTimeStamp = actualTimeStamp; + } + + public long getActualTimeStamp() { + return myActualTimeStamp; } @Override @@ -131,6 +166,19 @@ public class MockVirtualFile extends VirtualFile { throw new UnsupportedOperationException("Method getInputStream is not yet implemented in " + getClass().getName()); } + private VirtualFileListener myListener = null; + public void setListener(VirtualFileListener listener) { + myListener = listener; + } + + public void setContent(Object requestor, String content, boolean fireEvent) { + long oldStamp = myModStamp; + myText = content; + if (fireEvent) { + myModStamp = LocalTimeCounter.currentTime(); + myListener.contentsChanged(new VirtualFileEvent(requestor, this, null, oldStamp, myModStamp)); + } + } } From 73e303d324b862b1e71982c18f5b2115c7a58ac7 Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Thu, 26 Jan 2012 14:09:00 +0100 Subject: [PATCH 16/28] test for "Constant StringBuffer may be String" inspection --- ...ngBufferReplaceableByStringInspection.java | 39 +++++++------------ .../StringBufferReplaceableByString.java | 11 ++++++ .../expected.xml | 16 ++++++++ ...fferReplaceableByStringInspectionTest.java | 11 ++++++ 4 files changed, 51 insertions(+), 26 deletions(-) create mode 100644 plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/StringBufferReplaceableByString.java create mode 100644 plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/expected.xml create mode 100644 plugins/InspectionGadgets/testsrc/com/siyeh/ig/performance/StringBufferReplaceableByStringInspectionTest.java diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java index 5d6be63483a9..15cb757ba90c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferReplaceableByStringInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2003-2010 Dave Griffith, Bas Leijdekkers + * Copyright 2003-2012 Dave Griffith, Bas Leijdekkers * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,8 +24,7 @@ import com.siyeh.ig.psiutils.TypeUtils; import com.siyeh.ig.psiutils.VariableAccessUtils; import org.jetbrains.annotations.NotNull; -public class StringBufferReplaceableByStringInspection - extends BaseInspection { +public class StringBufferReplaceableByStringInspection extends BaseInspection { @Override @NotNull @@ -46,21 +45,17 @@ public class StringBufferReplaceableByStringInspection return new StringBufferReplaceableByStringBuilderVisitor(); } - private static class StringBufferReplaceableByStringBuilderVisitor - extends BaseInspectionVisitor { + private static class StringBufferReplaceableByStringBuilderVisitor extends BaseInspectionVisitor { @Override public void visitLocalVariable(@NotNull PsiLocalVariable variable) { super.visitLocalVariable(variable); - - final PsiCodeBlock codeBlock = - PsiTreeUtil.getParentOfType(variable, PsiCodeBlock.class); + final PsiCodeBlock codeBlock = PsiTreeUtil.getParentOfType(variable, PsiCodeBlock.class); if (codeBlock == null) { return; } final PsiType type = variable.getType(); - if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUFFER, - type) && + if (!TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUFFER, type) && !TypeUtils.typeEquals(CommonClassNames.JAVA_LANG_STRING_BUILDER, type)) { return; } @@ -80,8 +75,7 @@ public class StringBufferReplaceableByStringInspection if (VariableAccessUtils.variableIsReturned(variable, codeBlock)) { return; } - if (VariableAccessUtils.variableIsPassedAsMethodArgument(variable, - codeBlock)) { + if (VariableAccessUtils.variableIsPassedAsMethodArgument(variable, codeBlock)) { return; } if (variableIsModified(variable, codeBlock)) { @@ -90,16 +84,13 @@ public class StringBufferReplaceableByStringInspection registerVariableError(variable); } - public static boolean variableIsModified(PsiVariable variable, - PsiElement context) { - final VariableIsModifiedVisitor visitor = - new VariableIsModifiedVisitor(variable); + public static boolean variableIsModified(PsiVariable variable, PsiElement context) { + final VariableIsModifiedVisitor visitor = new VariableIsModifiedVisitor(variable); context.accept(visitor); return visitor.isModified(); } - private static boolean isNewStringBufferOrStringBuilder( - PsiExpression expression) { + private static boolean isNewStringBufferOrStringBuilder(PsiExpression expression) { if (expression == null) { return false; } @@ -107,16 +98,12 @@ public class StringBufferReplaceableByStringInspection return true; } else if (expression instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression methodCallExpression = - (PsiMethodCallExpression)expression; - if (!VariableIsModifiedVisitor.isStringBufferUpdate( - methodCallExpression)) { + final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)expression; + if (!VariableIsModifiedVisitor.isStringBufferUpdate(methodCallExpression)) { return false; } - final PsiReferenceExpression methodExpression = - methodCallExpression.getMethodExpression(); - final PsiExpression qualifier = - methodExpression.getQualifierExpression(); + final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression(); + final PsiExpression qualifier = methodExpression.getQualifierExpression(); return isNewStringBufferOrStringBuilder(qualifier); } return false; diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/StringBufferReplaceableByString.java b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/StringBufferReplaceableByString.java new file mode 100644 index 000000000000..7f0eb5b6fbfa --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/StringBufferReplaceableByString.java @@ -0,0 +1,11 @@ +package com.siyeh.igtest.performance.constant_string_buffer_may_be_string; + +public class StringBufferReplaceableByString { + + StringBuilder foo() { + StringBuilder builder = new StringBuilder("asdfasdfasdf"); + StringBuffer buffer = new StringBuffer("test"); + StringBuilder result = new StringBuilder("return"); + return result; + } +} diff --git a/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/expected.xml b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/expected.xml new file mode 100644 index 000000000000..7ecadfbba1b4 --- /dev/null +++ b/plugins/InspectionGadgets/test/com/siyeh/igtest/performance/constant_string_buffer_may_be_string/expected.xml @@ -0,0 +1,16 @@ + + + + StringBufferReplaceableByString.java + 6 + Constant StringBuffer may be String + Constant StringBuffer <code>builder</code> may be declared as String #loc + + + + StringBufferReplaceableByString.java + 7 + Constant StringBuffer may be String + Constant StringBuffer <code>buffer</code> may be declared as String #loc + + \ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/performance/StringBufferReplaceableByStringInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/performance/StringBufferReplaceableByStringInspectionTest.java new file mode 100644 index 000000000000..7b9a0e928b64 --- /dev/null +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/performance/StringBufferReplaceableByStringInspectionTest.java @@ -0,0 +1,11 @@ +package com.siyeh.ig.performance; + +import com.siyeh.ig.IGInspectionTestCase; + +public class StringBufferReplaceableByStringInspectionTest extends IGInspectionTestCase { + + public void test() throws Exception { + doTest("com/siyeh/igtest/performance/constant_string_buffer_may_be_string", + new StringBufferReplaceableByStringInspection()); + } +} \ No newline at end of file From 5613bcf15d5e39ecbcc10976ed4494fbfab80a0a Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Thu, 26 Jan 2012 17:09:16 +0300 Subject: [PATCH 17/28] IDEA-80368 (AE at com.intellij.codeInsight.completion.CodeCompletionHandlerBase$1$1.run) --- .../MavenRunnerParametersConfigurable.java | 76 ++++++++++--------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java index 36a845b23737..60c0e8227f25 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenRunnerParametersConfigurable.java @@ -64,53 +64,55 @@ public abstract class MavenRunnerParametersConfigurable implements Configurable, } }); - MyCompletionProvider profilesCompletionProvider = new MyCompletionProvider(project) { - @Override - protected void addVariants(@NotNull CompletionResultSet result, MavenProjectsManager manager) { - for (String profile : manager.getAvailableProfiles()) { - result.addElement(LookupElementBuilder.create(profile)); + if (!project.isDefault()) { + MyCompletionProvider profilesCompletionProvider = new MyCompletionProvider(project) { + @Override + protected void addVariants(@NotNull CompletionResultSet result, MavenProjectsManager manager) { + for (String profile : manager.getAvailableProfiles()) { + result.addElement(LookupElementBuilder.create(profile)); + } } - } - }; - - profilesComponent.setComponent(profilesCompletionProvider.createEditor(project)); + }; - MyCompletionProvider goalsCompletionProvider = new MyCompletionProvider(project) { - - private volatile List myCachedElements; - - @Override - protected void addVariants(@NotNull CompletionResultSet result, MavenProjectsManager manager) { - List cachedElements = myCachedElements; - if (cachedElements == null) { - Set goals = new HashSet(); - goals.addAll(MavenConstants.PHASES); + profilesComponent.setComponent(profilesCompletionProvider.createEditor(project)); - for (MavenProject mavenProject : manager.getProjects()) { - for (MavenPlugin plugin : mavenProject.getPlugins()) { - MavenPluginInfo pluginInfo = MavenArtifactUtil.readPluginInfo(manager.getLocalRepository(), plugin.getMavenId()); - if (pluginInfo != null) { - for (MavenPluginInfo.Mojo mojo : pluginInfo.getMojos()) { - goals.add(mojo.getDisplayName()); + MyCompletionProvider goalsCompletionProvider = new MyCompletionProvider(project) { + + private volatile List myCachedElements; + + @Override + protected void addVariants(@NotNull CompletionResultSet result, MavenProjectsManager manager) { + List cachedElements = myCachedElements; + if (cachedElements == null) { + Set goals = new HashSet(); + goals.addAll(MavenConstants.PHASES); + + for (MavenProject mavenProject : manager.getProjects()) { + for (MavenPlugin plugin : mavenProject.getPlugins()) { + MavenPluginInfo pluginInfo = MavenArtifactUtil.readPluginInfo(manager.getLocalRepository(), plugin.getMavenId()); + if (pluginInfo != null) { + for (MavenPluginInfo.Mojo mojo : pluginInfo.getMojos()) { + goals.add(mojo.getDisplayName()); + } } } } + + cachedElements = new ArrayList(goals.size()); + for (String goal : goals) { + cachedElements.add(LookupElementBuilder.create(goal).setIcon(MavenIcons.PHASE_ICON)); + } + + myCachedElements = cachedElements; } - cachedElements = new ArrayList(goals.size()); - for (String goal : goals) { - cachedElements.add(LookupElementBuilder.create(goal).setIcon(MavenIcons.PHASE_ICON)); - } - - myCachedElements = cachedElements; + result.addAllElements(cachedElements); } + }; + + goalsComponent.setComponent(goalsCompletionProvider.createEditor(project)); + } - result.addAllElements(cachedElements); - } - }; - - goalsComponent.setComponent(goalsCompletionProvider.createEditor(project)); - setAnchor(profilesComponent.getLabel()); } From e34c877e5359e112ada6580c32760aa675b0882f Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Wed, 25 Jan 2012 02:11:11 +0400 Subject: [PATCH 18/28] create static field for comment types set to avoid token set creation on each relevant token during indexing --- .../intellij/plugins/relaxNG/compact/RncParserDefinition.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncParserDefinition.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncParserDefinition.java index ac48d70d1a94..431b40e345b0 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncParserDefinition.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncParserDefinition.java @@ -43,6 +43,7 @@ import org.jetbrains.annotations.NotNull; */ public class RncParserDefinition implements ParserDefinition { public static final IFileElementType FILE_ELEMENT_TYPE = new IFileElementType(RngCompactLanguage.INSTANCE); + private static final TokenSet myCommentTypes = TokenSet.orSet(RncTokenTypes.COMMENTS, RncTokenTypes.DOC_TOKENS); @NotNull public Lexer createLexer(Project project) { @@ -64,7 +65,7 @@ public class RncParserDefinition implements ParserDefinition { @NotNull public TokenSet getCommentTokens() { - return TokenSet.orSet(RncTokenTypes.COMMENTS, RncTokenTypes.DOC_TOKENS); + return myCommentTypes; } @NotNull From 08674a48475eef33da3d66619687b26974c88187 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Wed, 25 Jan 2012 20:01:58 +0400 Subject: [PATCH 19/28] do not call bundle.message before actual reporting error --- .../lang/java/parser/DeclarationParser.java | 28 ++++++++++--------- .../lang/java/parser/ExpressionParser.java | 6 ++-- .../lang/java/parser/JavaParserUtil.java | 8 ++++-- .../lang/java/parser/ReferenceParser.java | 2 +- .../lang/java/parser/StatementParser.java | 4 +-- .../src/messages/JavaErrorMessages.properties | 1 + 6 files changed, 27 insertions(+), 22 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java index ccb8e83f70e2..510cab79e4de 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/DeclarationParser.java @@ -27,6 +27,7 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.util.text.CharArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.PropertyKey; import static com.intellij.lang.PsiBuilderUtil.expect; import static com.intellij.lang.PsiBuilderUtil.nextTokenType; @@ -86,7 +87,7 @@ public class DeclarationParser { } parseClassBodyDeclarations(builderWrapper, isAnnotation); - expectOrError(builder, JavaTokenType.RBRACE, JavaErrorMessages.message("expected.rbrace")); + expectOrError(builder, JavaTokenType.RBRACE, "expected.rbrace"); } @Nullable @@ -139,7 +140,7 @@ public class DeclarationParser { } if (declarationsAfterEnd) { - expectOrError(builder, JavaTokenType.RBRACE, JavaErrorMessages.message("expected.rbrace")); + expectOrError(builder, JavaTokenType.RBRACE, "expected.rbrace"); } } @@ -426,7 +427,7 @@ public class DeclarationParser { final boolean anno, final boolean constructor) { parseParameterList(builder); - eatBrackets(builder, constructor, JavaErrorMessages.message("expected.semicolon")); + eatBrackets(builder, constructor, "expected.semicolon"); if (areTypeAnnotationsSupported(builder)) { final PsiBuilder.Marker receiver = builder.mark(); @@ -489,8 +490,8 @@ public class DeclarationParser { builder.advanceLexer(); final IElementType delimiter = resources ? JavaTokenType.SEMICOLON : JavaTokenType.COMMA; - final String noDelimiterMsg = JavaErrorMessages.message(resources ? "expected.semicolon" : "expected.comma"); - final String noElementMsg = JavaErrorMessages.message(resources ? "expected.resource" : "expected.parameter"); + final String noDelimiterMsg = resources ? "expected.semicolon" : "expected.comma"; + final String noElementMsg = resources ? "expected.resource" : "expected.parameter"; PsiBuilder.Marker invalidElements = null; String errorMessage = null; @@ -548,7 +549,7 @@ public class DeclarationParser { if (invalidElements == null) { if (builder.getTokenType() == delimiter) { - error(builder, noElementMsg); + error(builder, JavaErrorMessages.message(noElementMsg)); builder.advanceLexer(); if (noElements && resources) { noElements = false; @@ -557,7 +558,7 @@ public class DeclarationParser { } else { invalidElements = builder.mark(); - errorMessage = delimiterExpected ? noDelimiterMsg : noElementMsg; + errorMessage = JavaErrorMessages.message(delimiterExpected ? noDelimiterMsg : noElementMsg); } } @@ -613,7 +614,7 @@ public class DeclarationParser { if (expect(builder, JavaTokenType.IDENTIFIER)) { if (!resource) { - eatBrackets(builder, typeInfo != null && typeInfo.isVarArg, JavaErrorMessages.message("expected.rparen")); + eatBrackets(builder, typeInfo != null && typeInfo.isVarArg, "expected.rparen"); done(param, JavaElementType.PARAMETER); return param; } @@ -624,7 +625,7 @@ public class DeclarationParser { return modListInfo.first; } - if (expectOrError(builder, JavaTokenType.EQ, JavaErrorMessages.message("expected.eq"))) { + if (expectOrError(builder, JavaTokenType.EQ, "expected.eq")) { if (myExpressionParser.parse(builder) == null) { error(builder, JavaErrorMessages.message("expected.expression")); } @@ -720,7 +721,8 @@ public class DeclarationParser { return declaration; } - private static boolean eatBrackets(final PsiBuilder builder, final boolean isError, @Nullable final String error) { + private static boolean eatBrackets(final PsiBuilder builder, final boolean isError, + @Nullable @PropertyKey(resourceBundle = JavaErrorMessages.BUNDLE) String errorKey) { if (builder.getTokenType() != JavaTokenType.LBRACKET) return true; final PsiBuilder.Marker marker = isError ? builder.mark() : null; @@ -735,7 +737,7 @@ public class DeclarationParser { } if (marker != null) { - marker.error(error); + marker.error(errorKey != null ? JavaErrorMessages.message(errorKey):null); } return result; @@ -840,9 +842,9 @@ public class DeclarationParser { pair = builder.mark(); } - final boolean hasName = expectOrError(builder, JavaTokenType.IDENTIFIER, JavaErrorMessages.message("expected.identifier")); + final boolean hasName = expectOrError(builder, JavaTokenType.IDENTIFIER, "expected.identifier"); - expectOrError(builder, JavaTokenType.EQ, JavaErrorMessages.message("expected.eq")); + expectOrError(builder, JavaTokenType.EQ, "expected.eq"); parseAnnotationValue(builder); diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java index 8424d8defa81..d8ee0e01f8db 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ExpressionParser.java @@ -404,7 +404,7 @@ public class ExpressionParser { final PsiBuilder.Marker refExpr = expr.precede(); myReferenceParser.parseReferenceParameterList(builder, false, false); - if (!JavaParserUtil.expectOrError(builder, JavaTokenType.IDENTIFIER, JavaErrorMessages.message("expected.identifier"))) { + if (!JavaParserUtil.expectOrError(builder, JavaTokenType.IDENTIFIER, "expected.identifier")) { refExpr.done(JavaElementType.REFERENCE_EXPRESSION); startMarker.drop(); return refExpr; @@ -726,7 +726,7 @@ public class ExpressionParser { } bracketCount++; - if (!JavaParserUtil.expectOrError(builder, JavaTokenType.RBRACKET, JavaErrorMessages.message("expected.rbracket"))) { + if (!JavaParserUtil.expectOrError(builder, JavaTokenType.RBRACKET, "expected.rbracket")) { newExpr.done(JavaElementType.NEW_EXPRESSION); return newExpr; } @@ -812,7 +812,7 @@ public class ExpressionParser { } } - final boolean closed = JavaParserUtil.expectOrError(builder, JavaTokenType.RPARENTH, JavaErrorMessages.message("expected.rparen")); + final boolean closed = JavaParserUtil.expectOrError(builder, JavaTokenType.RPARENTH, "expected.rparen"); list.done(JavaElementType.EXPRESSION_LIST); if (!closed) { diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java index d3fd09cc889f..6af4ce564138 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/JavaParserUtil.java @@ -39,6 +39,7 @@ import com.intellij.psi.tree.TokenSet; import com.intellij.psi.util.PsiUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.PropertyKey; import java.util.List; @@ -258,9 +259,10 @@ public class JavaParserUtil { } } - public static boolean expectOrError(final PsiBuilder builder, final IElementType expectedType, final String errorMessage) { + public static boolean expectOrError(final PsiBuilder builder, final IElementType expectedType, + @PropertyKey(resourceBundle = JavaErrorMessages.BUNDLE) String errorMessageKey) { if (!PsiBuilderUtil.expect(builder, expectedType)) { - error(builder, errorMessage); + error(builder, JavaErrorMessages.message(errorMessageKey)); return false; } return true; @@ -275,7 +277,7 @@ public class JavaParserUtil { } public static void semicolon(final PsiBuilder builder) { - expectOrError(builder, JavaTokenType.SEMICOLON, JavaErrorMessages.message("expected.semicolon")); + expectOrError(builder, JavaTokenType.SEMICOLON, "expected.semicolon"); } public static PsiBuilder braceMatchingBuilder(final PsiBuilder builder) { diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java index 68fd2ff197e3..9382af0cac6b 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/ReferenceParser.java @@ -293,7 +293,7 @@ public class ReferenceParser { if (expect(builder, JavaTokenType.GT)) { break; } - else if (!expectOrError(builder, JavaTokenType.COMMA, JavaErrorMessages.message("expected.gt.or.comma"))) { + else if (!expectOrError(builder, JavaTokenType.COMMA, "expected.gt.or.comma")) { isOk = false; break; } diff --git a/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java b/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java index b4294f6a4cd9..95ad7cfd72a8 100644 --- a/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java +++ b/java/java-psi-impl/src/com/intellij/lang/java/parser/StatementParser.java @@ -131,7 +131,7 @@ public class StatementParser { parseStatements(builder, parseUntilEof ? BraceMode.TILL_LAST : BraceMode.TILL_FIRST); - final boolean greedyBlock = !expectOrError(builder, JavaTokenType.RBRACE, JavaErrorMessages.message("expected.rbrace")); + final boolean greedyBlock = !expectOrError(builder, JavaTokenType.RBRACE, "expected.rbrace"); builder.getTokenType(); // eat spaces done(codeBlock, JavaElementType.CODE_BLOCK); @@ -543,7 +543,7 @@ public class StatementParser { } } - expectOrError(builder, JavaTokenType.COLON, JavaErrorMessages.message("expected.colon")); + expectOrError(builder, JavaTokenType.COLON, "expected.colon"); done(statement, JavaElementType.SWITCH_LABEL_STATEMENT); return statement; diff --git a/java/java-psi-impl/src/messages/JavaErrorMessages.properties b/java/java-psi-impl/src/messages/JavaErrorMessages.properties index 317aeb1326bb..1c83fe4b3480 100644 --- a/java/java-psi-impl/src/messages/JavaErrorMessages.properties +++ b/java/java-psi-impl/src/messages/JavaErrorMessages.properties @@ -328,6 +328,7 @@ expected.lparen.or.lbracket='(' or '[' expected expected.array.initializer=Array initializer expected unexpected.tokens=Unexpected tokens expected.gt.or.comma='>' or ',' expected. +string.expected=String literal expected else.without.if='else' without 'if' catch.without.try='catch' without 'try' finally.without.try='finally' without 'try' From 1fd9395de4046946ce1e1e929b57360d80e5083e Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 26 Jan 2012 17:28:13 +0400 Subject: [PATCH 20/28] less garbage and synchronization during building indexed --- .../intellij/images/util/ImageInfoReader.java | 3 +- .../psi/stubs/SerializedStubTree.java | 5 +- .../BufferExposingByteArrayInputStream.java | 7 +- .../BufferExposingByteArrayOutputStream.java | 16 ++- .../com/intellij/util/io/IntToIntBtree.java | 11 +- .../util/io/PersistentBTreeEnumerator.java | 17 +-- .../intellij/util/io/PersistentHashMap.java | 111 +++++++----------- .../io/PersistentHashMapValueStorage.java | 7 +- .../util/io/UnsyncByteArrayInputStream.java | 69 +++++++++++ .../util/io/UnsyncByteArrayOutputStream.java | 77 ++++++++++++ .../util/io/storage/AbstractStorage.java | 3 +- .../properties/xml/XmlPropertiesIndex.java | 7 +- .../com/intellij/util/xml/DomFileIndex.java | 4 +- .../intellij/xml/index/XmlNamespaceIndex.java | 4 +- .../intellij/xml/index/XmlTagNamesIndex.java | 4 +- 15 files changed, 234 insertions(+), 111 deletions(-) create mode 100644 platform/util/src/com/intellij/util/io/UnsyncByteArrayInputStream.java create mode 100644 platform/util/src/com/intellij/util/io/UnsyncByteArrayOutputStream.java diff --git a/images/src/org/intellij/images/util/ImageInfoReader.java b/images/src/org/intellij/images/util/ImageInfoReader.java index 1c809bbba28f..7dd764faa328 100644 --- a/images/src/org/intellij/images/util/ImageInfoReader.java +++ b/images/src/org/intellij/images/util/ImageInfoReader.java @@ -16,6 +16,7 @@ package org.intellij.images.util; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.util.io.UnsyncByteArrayInputStream; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -65,7 +66,7 @@ public class ImageInfoReader { @Nullable private static Info read(@NotNull final byte[] data) { - final DataInputStream is = new DataInputStream(new ByteArrayInputStream(data)); + final DataInputStream is = new DataInputStream(new UnsyncByteArrayInputStream(data)); try { return readFileData(is); } diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/SerializedStubTree.java b/platform/lang-impl/src/com/intellij/psi/stubs/SerializedStubTree.java index abaf63828b69..d7423c8420b2 100644 --- a/platform/lang-impl/src/com/intellij/psi/stubs/SerializedStubTree.java +++ b/platform/lang-impl/src/com/intellij/psi/stubs/SerializedStubTree.java @@ -19,7 +19,8 @@ */ package com.intellij.psi.stubs; -import java.io.ByteArrayInputStream; +import com.intellij.util.io.UnsyncByteArrayInputStream; + import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; @@ -45,7 +46,7 @@ public class SerializedStubTree { } public StubElement getStub() { - return SerializationManager.getInstance().deserialize(new ByteArrayInputStream(myBytes)); + return SerializationManager.getInstance().deserialize(new UnsyncByteArrayInputStream(myBytes)); } public boolean equals(final Object that) { diff --git a/platform/util/src/com/intellij/openapi/util/io/BufferExposingByteArrayInputStream.java b/platform/util/src/com/intellij/openapi/util/io/BufferExposingByteArrayInputStream.java index d0c9412efe07..9a2efb3e2ba7 100644 --- a/platform/util/src/com/intellij/openapi/util/io/BufferExposingByteArrayInputStream.java +++ b/platform/util/src/com/intellij/openapi/util/io/BufferExposingByteArrayInputStream.java @@ -15,17 +15,16 @@ */ package com.intellij.openapi.util.io; +import com.intellij.util.io.UnsyncByteArrayInputStream; import org.jetbrains.annotations.NotNull; -import java.io.ByteArrayInputStream; - -public class BufferExposingByteArrayInputStream extends ByteArrayInputStream { +public class BufferExposingByteArrayInputStream extends UnsyncByteArrayInputStream { public BufferExposingByteArrayInputStream(@NotNull byte[] bytes) { super(bytes); } @NotNull public byte[] getInternalBuffer() { - return buf; + return myBuffer; } } diff --git a/platform/util/src/com/intellij/openapi/util/io/BufferExposingByteArrayOutputStream.java b/platform/util/src/com/intellij/openapi/util/io/BufferExposingByteArrayOutputStream.java index 61fe2ea73020..990088c1842f 100644 --- a/platform/util/src/com/intellij/openapi/util/io/BufferExposingByteArrayOutputStream.java +++ b/platform/util/src/com/intellij/openapi/util/io/BufferExposingByteArrayOutputStream.java @@ -15,13 +15,11 @@ */ package com.intellij.openapi.util.io; +import com.intellij.util.io.UnsyncByteArrayOutputStream; import org.jetbrains.annotations.NotNull; -import java.io.ByteArrayOutputStream; - -public class BufferExposingByteArrayOutputStream extends ByteArrayOutputStream { - public BufferExposingByteArrayOutputStream() { - } +public class BufferExposingByteArrayOutputStream extends UnsyncByteArrayOutputStream { + public BufferExposingByteArrayOutputStream() {} public BufferExposingByteArrayOutputStream(int size) { super(size); @@ -29,14 +27,14 @@ public class BufferExposingByteArrayOutputStream extends ByteArrayOutputStream { @NotNull public byte[] getInternalBuffer() { - return buf; + return myBuffer; } // moves back the written bytes pointer by {@link #size}, to "unwrite" last {@link #size} bytes public int backOff(int size) { assert size >= 0 : size; - count -= size; - assert count >= 0 : count; - return count; + myCount -= size; + assert myCount >= 0 : myCount; + return myCount; } } diff --git a/platform/util/src/com/intellij/util/io/IntToIntBtree.java b/platform/util/src/com/intellij/util/io/IntToIntBtree.java index 8df25adaa3b8..5c73f192038d 100644 --- a/platform/util/src/com/intellij/util/io/IntToIntBtree.java +++ b/platform/util/src/com/intellij/util/io/IntToIntBtree.java @@ -2,7 +2,6 @@ package com.intellij.util.io; import com.intellij.openapi.util.io.FileUtil; import gnu.trove.TIntIntHashMap; -import org.jetbrains.annotations.Nullable; import java.io.File; import java.io.IOException; @@ -130,10 +129,11 @@ class IntToIntBtree { return pageStart; } - public @Nullable Integer get(int key) { + public boolean get(int key, int[] result) { if (hasCachedMappings) { if (myCachedMappings.containsKey(key)) { - return myCachedMappings.get(key); + result[0] = myCachedMappings.get(key); + return true; } } @@ -141,8 +141,9 @@ class IntToIntBtree { currentIndexNode.setAddress(root.address); int index = currentIndexNode.locate(key, false); - if (index < 0) return null; - return currentIndexNode.addressAt(index); + if (index < 0) return false; + result[0] = currentIndexNode.addressAt(index); + return true; } public void put(int key, int value) { diff --git a/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java b/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java index f99784a9d79d..5c21065d3a33 100644 --- a/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java +++ b/platform/util/src/com/intellij/util/io/PersistentBTreeEnumerator.java @@ -186,9 +186,11 @@ public class PersistentBTreeEnumerator extends PersistentEnumeratorBase 0) { if (!p.process(record)) return false; } else { @@ -259,22 +261,23 @@ public class PersistentBTreeEnumerator extends PersistentEnumeratorBase 0) { @@ -309,7 +312,7 @@ public class PersistentBTreeEnumerator extends PersistentEnumeratorBase extends PersistentEnumeratorDelegate< super(new BufferExposingByteArrayOutputStream()); } - public int getBufferSize() { - return ((ByteArrayOutputStream)out).size(); + private void reset() { + ((UnsyncByteArrayOutputStream)out).reset(); } - public void writeTo(OutputStream stream) throws IOException { - ((ByteArrayOutputStream)out).writeTo(stream); - } - - public void reset() { - ((ByteArrayOutputStream)out).reset(); - } - - public byte[] toByteArray() { - return ((ByteArrayOutputStream)out).toByteArray(); - } - - public ByteSequence getInternalBuffer() { - final BufferExposingByteArrayOutputStream _out = (BufferExposingByteArrayOutputStream)out; - return new ByteSequence(_out.getInternalBuffer(), 0, _out.size()); + private BufferExposingByteArrayOutputStream getInternalBuffer() { + return (BufferExposingByteArrayOutputStream)out; } } @@ -110,16 +97,14 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< protected void onDropFromCache(final Key key, final AppendStream value) { synchronized (PersistentEnumerator.ourLock) { try { - final ByteSequence bytes = value.getInternalBuffer(); + final BufferExposingByteArrayOutputStream bytes = value.getInternalBuffer(); final int id = enumerate(key); - HeaderRecord oldHeaderRecord = readValueId(id); + long oldHeaderRecord = readValueId(id); - HeaderRecord headerRecord = new HeaderRecord( - myValueStorage.appendBytes(bytes, oldHeaderRecord.address) - ); + long headerRecord = myValueStorage.appendBytes(bytes.getInternalBuffer(), 0, bytes.size(), oldHeaderRecord); updateValueId(id, headerRecord, oldHeaderRecord, key, 0); - if (oldHeaderRecord == HeaderRecord.EMPTY) { + if (oldHeaderRecord == NULL_ADDR) { myLiveAndGarbageKeysCounter += LIVE_KEY_MASK; } @@ -266,18 +251,18 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< final AppendStream record = new AppendStream(); myValueExternalizer.save(record, value); - final ByteSequence bytes = record.getInternalBuffer(); + final BufferExposingByteArrayOutputStream bytes = record.getInternalBuffer(); final int id = enumerate(key); - HeaderRecord oldheader = readValueId(id); - if (oldheader != HeaderRecord.EMPTY) { + long oldheader = readValueId(id); + if (oldheader != NULL_ADDR) { myLiveAndGarbageKeysCounter++; } else { myLiveAndGarbageKeysCounter += LIVE_KEY_MASK; } - HeaderRecord header = new HeaderRecord(myValueStorage.appendBytes(bytes, 0)); + long header = myValueStorage.appendBytes(bytes.getInternalBuffer(), 0, bytes.size(), 0); updateValueId(id, header, oldheader, key, 0); } @@ -330,41 +315,39 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< myAppendCache.clear(); return myEnumerator.processAllDataObject(processor, new PersistentEnumerator.DataFilter() { public boolean accept(final int id) { - return readValueId(id).address != NULL_ADDR; + return readValueId(id) != NULL_ADDR; } }); } } - public final Value get(Key key) throws IOException { + public final @Nullable Value get(Key key) throws IOException { synchronized (myEnumerator) { return doGet(key); } } - protected Value doGet(Key key) throws IOException { + protected @Nullable Value doGet(Key key) throws IOException { synchronized (PersistentEnumerator.ourLock) { myAppendCache.remove(key); final int id = tryEnumerate(key); if (id == PersistentEnumerator.NULL_ID) { return null; } - final HeaderRecord oldHeader = readValueId(id); - if (oldHeader.address == PersistentEnumerator.NULL_ID) { + final long oldHeader = readValueId(id); + if (oldHeader == PersistentEnumerator.NULL_ID) { return null; } - Pair readResult = myValueStorage.readBytes(oldHeader.address); - if (readResult.first != null && readResult.first != oldHeader.address) { + Pair readResult = myValueStorage.readBytes(oldHeader); + if (readResult.first != null && readResult.first != oldHeader) { myEnumerator.markDirty(true); - updateValueId(id, new HeaderRecord(readResult.first), oldHeader, key, 0); - if (oldHeader != HeaderRecord.EMPTY) { - myLiveAndGarbageKeysCounter++; - } + updateValueId(id, readResult.first, oldHeader, key, 0); + myLiveAndGarbageKeysCounter++; } - final DataInputStream input = new DataInputStream(new ByteArrayInputStream(readResult.second)); + final DataInputStream input = new DataInputStream(new UnsyncByteArrayInputStream(readResult.second)); try { return myValueExternalizer.read(input); } @@ -387,7 +370,7 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< if (id == PersistentEnumerator.NULL_ID) { return false; } - return readValueId(id).address != NULL_ADDR; + return readValueId(id) != NULL_ADDR; } } @@ -406,12 +389,12 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< } myEnumerator.markDirty(true); - final HeaderRecord record = readValueId(id); - if (record != HeaderRecord.EMPTY) { + final long record = readValueId(id); + if (record != NULL_ADDR) { myLiveAndGarbageKeysCounter++; } - updateValueId(id, HeaderRecord.EMPTY, record, key, 0); + updateValueId(id, NULL_ADDR, record, key, 0); } } @@ -473,10 +456,10 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< traverseAllRecords(new PersistentEnumerator.RecordsProcessor() { public boolean process(final int keyId) throws IOException { - final HeaderRecord record = readValueId(keyId); - if (record.address != NULL_ADDR) { - Pair readResult = myValueStorage.readBytes(record.address); - HeaderRecord value = new HeaderRecord(newStorage.appendBytes(new ByteSequence(readResult.second), 0)); + final long record = readValueId(keyId); + if (record != NULL_ADDR) { + Pair readResult = myValueStorage.readBytes(record); + long value = newStorage.appendBytes(new ByteSequence(readResult.second), 0); updateValueId(keyId, value, record, null, getCurrentKey()); myLiveAndGarbageKeysCounter += LIVE_KEY_MASK; } @@ -496,10 +479,10 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< } } - private HeaderRecord readValueId(final int keyId) { + private long readValueId(final int keyId) { long address = myEnumerator.myStorage.getInt(keyId + myParentValueRefOffset); if (address == 0 || address == -POSITIVE_VALUE_SHIFT) { - return HeaderRecord.EMPTY; + return NULL_ADDR; } if (address < 0) { @@ -509,7 +492,7 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< address = ((address << 32) + value) & ~USED_LONG_VALUE_MASK; } - return new HeaderRecord(address); + return address; } private int smallKeys; @@ -517,19 +500,19 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< private int transformedKeys; private int requests; - private int updateValueId(int keyId, HeaderRecord value, HeaderRecord oldValue, @Nullable Key key, int processingKey) throws IOException { - final boolean newKey = oldValue == null || oldValue.address == NULL_ADDR; + private int updateValueId(int keyId, long value, long oldValue, @Nullable Key key, int processingKey) throws IOException { + final boolean newKey = oldValue == NULL_ADDR; if (newKey) ++requests; boolean defaultSizeInfo = true; if (myCanReEnumerate) { - if (canUseIntAddressForNewRecord(value.address)) { + if (canUseIntAddressForNewRecord(value)) { defaultSizeInfo = false; - myEnumerator.myStorage.putInt(keyId + myParentValueRefOffset, -(int)(value.address + POSITIVE_VALUE_SHIFT)); + myEnumerator.myStorage.putInt(keyId + myParentValueRefOffset, -(int)(value + POSITIVE_VALUE_SHIFT)); if (newKey) ++smallKeys; } else { if (newKey && myWatermarkId == 0) myWatermarkId = keyId; - if (keyId < myWatermarkId && (oldValue == null || canUseIntAddressForNewRecord(oldValue.address))) { + if (keyId < myWatermarkId && (oldValue == NULL_ADDR || canUseIntAddressForNewRecord(oldValue))) { // keyId is result of enumerate, if we do reenumerate then it is no longer accessible unless somebody cached it myIntAddressForNewRecord = false; keyId = myEnumerator.reenumerate(key == null ? myEnumerator.getValue(keyId, processingKey) : key); @@ -539,7 +522,7 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< } if (defaultSizeInfo) { - myEnumerator.myStorage.putLong(keyId + myParentValueRefOffset, value.address | USED_LONG_VALUE_MASK); + myEnumerator.myStorage.putLong(keyId + myParentValueRefOffset, value | USED_LONG_VALUE_MASK); if (newKey) ++largeKeys; } @@ -548,21 +531,11 @@ public class PersistentHashMap extends PersistentEnumeratorDelegate< ",@"+getBaseFile().getPath()); } if (doHardConsistencyChecks) { - HeaderRecord checkRecord = readValueId(keyId); - if (checkRecord.address != value.address) { - assert false:value.address; + long checkRecord = readValueId(keyId); + if (checkRecord != value) { + assert false:value; } } return keyId; } - - private static class HeaderRecord { - final long address; - - HeaderRecord(long address) { - this.address = address; - } - - static final HeaderRecord EMPTY = new HeaderRecord(NULL_ADDR); - } } diff --git a/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java index 6edddcd02ace..26daa4379a9c 100644 --- a/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java +++ b/platform/util/src/com/intellij/util/io/PersistentHashMapValueStorage.java @@ -79,10 +79,13 @@ public class PersistentHashMapValueStorage { private static final int INT_LENGTH_LONG_ADDRESS = 4 + 8; public long appendBytes(ByteSequence data, long prevChunkAddress) throws IOException { + return appendBytes(data.getBytes(), data.getOffset(), data.getLength(), prevChunkAddress); + } + + public long appendBytes(byte[] data, int offset, int dataLength, long prevChunkAddress) throws IOException { assert !myCompactionMode; long result = mySize; final CacheValue appender = ourAppendersCache.get(myPath); - int dataLength = data.getLength(); int serviceFieldsSizeIncrease; try { @@ -102,7 +105,7 @@ public class PersistentHashMapValueStorage { dataOutputStream.writeLong(prevChunkAddress); serviceFieldsSizeIncrease = INT_LENGTH_LONG_ADDRESS; } - dataOutputStream.write(data.getBytes(), data.getOffset(), dataLength); + dataOutputStream.write(data, offset, dataLength); if (requests % IOStatistics.KEYS_FACTOR == 0 && IOStatistics.DEBUG) { IOStatistics.dump("Small writes:"+smallWritesCount +", bytes:"+smallWrites + ", largeWrites:"+largeWritesCount + ", bytes:"+largeWrites+", total:"+requests + "@"+myFile.getPath()); diff --git a/platform/util/src/com/intellij/util/io/UnsyncByteArrayInputStream.java b/platform/util/src/com/intellij/util/io/UnsyncByteArrayInputStream.java new file mode 100644 index 000000000000..c22a9ecb0818 --- /dev/null +++ b/platform/util/src/com/intellij/util/io/UnsyncByteArrayInputStream.java @@ -0,0 +1,69 @@ +package com.intellij.util.io; + +import java.io.InputStream; + +public class UnsyncByteArrayInputStream extends InputStream { + protected byte[] myBuffer; + private int myPosition; + private int myCount; + private int myMarkedPosition; + + public UnsyncByteArrayInputStream(byte buf[]) { + this.myBuffer = buf; + this.myPosition = 0; + this.myCount = buf.length; + } + + public int read() { + return (myPosition < myCount) ? (myBuffer[myPosition++] & 0xff) : -1; + } + + public int read(byte b[], int off, int len) { + if (b == null) { + throw new NullPointerException(); + } else if (off < 0 || len < 0 || len > b.length - off) { + throw new IndexOutOfBoundsException(); + } + if (myPosition >= myCount) { + return -1; + } + if (myPosition + len > myCount) { + len = myCount - myPosition; + } + if (len <= 0) { + return 0; + } + System.arraycopy(myBuffer, myPosition, b, off, len); + myPosition += len; + return len; + } + + public long skip(long n) { + if (myPosition + n > myCount) { + n = myCount - myPosition; + } + if (n < 0) { + return 0; + } + myPosition += n; + return n; + } + + public int available() { + return myCount - myPosition; + } + + @Override + public boolean markSupported() { + return true; + } + + @Override + public void mark(int readlimit) { + myMarkedPosition = myPosition; + } + + public void reset() { + myPosition = myMarkedPosition; + } +} diff --git a/platform/util/src/com/intellij/util/io/UnsyncByteArrayOutputStream.java b/platform/util/src/com/intellij/util/io/UnsyncByteArrayOutputStream.java new file mode 100644 index 000000000000..3ba1db36b94b --- /dev/null +++ b/platform/util/src/com/intellij/util/io/UnsyncByteArrayOutputStream.java @@ -0,0 +1,77 @@ +/* + * Copyright 2000-2012 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.util.io; + +import java.io.IOException; +import java.io.OutputStream; +import java.util.Arrays; + +public class UnsyncByteArrayOutputStream extends OutputStream { + protected byte[] myBuffer; + protected int myCount; + + public UnsyncByteArrayOutputStream() { + this(32); + } + + public UnsyncByteArrayOutputStream(int size) { + myBuffer = new byte[size]; + } + + public void write(int b) { + int newcount = myCount + 1; + if (newcount > myBuffer.length) { + myBuffer = Arrays.copyOf(myBuffer, Math.max(myBuffer.length << 1, newcount)); + } + myBuffer[myCount] = (byte)b; + myCount = newcount; + } + + public void write(byte b[], int off, int len) { + if ((off < 0) || (off > b.length) || (len < 0) || + ((off + len) > b.length) || ((off + len) < 0)) { + throw new IndexOutOfBoundsException(); + } else if (len == 0) { + return; + } + int newcount = myCount + len; + if (newcount > myBuffer.length) { + myBuffer = Arrays.copyOf(myBuffer, Math.max(myBuffer.length << 1, newcount)); + } + System.arraycopy(b, off, myBuffer, myCount, len); + myCount = newcount; + } + + public void writeTo(OutputStream out) throws IOException { + out.write(myBuffer, 0, myCount); + } + + public void reset() { + myCount = 0; + } + + public byte[] toByteArray() { + return Arrays.copyOf(myBuffer, myCount); + } + + public int size() { + return myCount; + } + + public String toString() { + return new String(myBuffer, 0, myCount); + } +} diff --git a/platform/util/src/com/intellij/util/io/storage/AbstractStorage.java b/platform/util/src/com/intellij/util/io/storage/AbstractStorage.java index 8051d48d0b82..e98173172044 100644 --- a/platform/util/src/com/intellij/util/io/storage/AbstractStorage.java +++ b/platform/util/src/com/intellij/util/io/storage/AbstractStorage.java @@ -28,6 +28,7 @@ import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.io.PagePool; import com.intellij.util.io.RecordDataOutput; +import com.intellij.util.io.UnsyncByteArrayInputStream; import org.jetbrains.annotations.NonNls; import java.io.*; @@ -228,7 +229,7 @@ public abstract class AbstractStorage implements Disposable, Forceable { public DataInputStream readStream(int record) throws IOException { final byte[] bytes = readBytes(record); - return new DataInputStream(new ByteArrayInputStream(bytes)); + return new DataInputStream(new UnsyncByteArrayInputStream(bytes)); } protected byte[] readBytes(int record) throws IOException { diff --git a/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java b/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java index a0473e9fa33b..827c08987a22 100644 --- a/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java +++ b/plugins/properties/src/com/intellij/lang/properties/xml/XmlPropertiesIndex.java @@ -5,10 +5,7 @@ import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.io.StreamUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.indexing.*; -import com.intellij.util.io.DataExternalizer; -import com.intellij.util.io.EnumeratorStringDescriptor; -import com.intellij.util.io.IOUtil; -import com.intellij.util.io.KeyDescriptor; +import com.intellij.util.io.*; import com.intellij.util.xml.NanoXmlUtil; import net.n3.nanoxml.StdXMLReader; import org.jetbrains.annotations.NotNull; @@ -91,7 +88,7 @@ public class XmlPropertiesIndex extends FileBasedIndexExtension{ @NotNull public Map map(final FileContent inputData) { final Set namespaces = new THashSet(); - final XmlFileHeader header = NanoXmlUtil.parseHeader(new ByteArrayInputStream(inputData.getContent())); + final XmlFileHeader header = NanoXmlUtil.parseHeader(new UnsyncByteArrayInputStream(inputData.getContent())); ContainerUtil.addIfNotNull(header.getPublicId(), namespaces); ContainerUtil.addIfNotNull(header.getSystemId(), namespaces); ContainerUtil.addIfNotNull(header.getRootTagNamespace(), namespaces); diff --git a/xml/impl/src/com/intellij/xml/index/XmlNamespaceIndex.java b/xml/impl/src/com/intellij/xml/index/XmlNamespaceIndex.java index 8cd41a372f2e..5af871e438af 100644 --- a/xml/impl/src/com/intellij/xml/index/XmlNamespaceIndex.java +++ b/xml/impl/src/com/intellij/xml/index/XmlNamespaceIndex.java @@ -24,10 +24,10 @@ import com.intellij.util.indexing.FileBasedIndex; import com.intellij.util.indexing.FileContent; import com.intellij.util.indexing.ID; import com.intellij.util.io.DataExternalizer; +import com.intellij.util.io.UnsyncByteArrayInputStream; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.io.ByteArrayInputStream; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -67,7 +67,7 @@ public class XmlNamespaceIndex extends XmlIndex { return new DataIndexer() { @NotNull public Map map(final FileContent inputData) { - final String ns = XsdNamespaceBuilder.computeNamespace(new ByteArrayInputStream(inputData.getContent())); + final String ns = XsdNamespaceBuilder.computeNamespace(new UnsyncByteArrayInputStream(inputData.getContent())); final HashMap map = new HashMap(2); if (ns != null) { map.put(ns, ""); diff --git a/xml/impl/src/com/intellij/xml/index/XmlTagNamesIndex.java b/xml/impl/src/com/intellij/xml/index/XmlTagNamesIndex.java index b18d184ca698..a8d1901574a3 100644 --- a/xml/impl/src/com/intellij/xml/index/XmlTagNamesIndex.java +++ b/xml/impl/src/com/intellij/xml/index/XmlTagNamesIndex.java @@ -20,9 +20,9 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.containers.HashMap; import com.intellij.util.indexing.*; import com.intellij.util.io.DataExternalizer; +import com.intellij.util.io.UnsyncByteArrayInputStream; import org.jetbrains.annotations.NotNull; -import java.io.ByteArrayInputStream; import java.util.Collection; import java.util.Collections; import java.util.Map; @@ -50,7 +50,7 @@ public class XmlTagNamesIndex extends XmlIndex { return new DataIndexer() { @NotNull public Map map(final FileContent inputData) { - final Collection tags = XsdTagNameBuilder.computeTagNames(new ByteArrayInputStream(inputData.getContent())); + final Collection tags = XsdTagNameBuilder.computeTagNames(new UnsyncByteArrayInputStream(inputData.getContent())); if (tags != null && !tags.isEmpty()) { final HashMap map = new HashMap(tags.size()); for (String tag : tags) { From 37f420c1506207c55639f393bac551ce8aec77c9 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 24 Jan 2012 12:22:20 +0400 Subject: [PATCH 21/28] typo --- .../lang/cacheBuilder/DefaultWordsScanner.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/platform/lang-api/src/com/intellij/lang/cacheBuilder/DefaultWordsScanner.java b/platform/lang-api/src/com/intellij/lang/cacheBuilder/DefaultWordsScanner.java index 3c87dda6701c..8f777e4864c9 100644 --- a/platform/lang-api/src/com/intellij/lang/cacheBuilder/DefaultWordsScanner.java +++ b/platform/lang-api/src/com/intellij/lang/cacheBuilder/DefaultWordsScanner.java @@ -51,29 +51,29 @@ public class DefaultWordsScanner implements WordsScanner { public void processWords(CharSequence fileText, Processor processor) { myLexer.start(fileText); - WordOccurrence occurence = null; // shared occurence + WordOccurrence occurrence = null; // shared occurrence while (myLexer.getTokenType() != null) { final IElementType type = myLexer.getTokenType(); if (myIdentifierTokenSet.contains(type)) { - if (occurence == null) { - occurence = new WordOccurrence(fileText, myLexer.getTokenStart(), myLexer.getTokenEnd(), WordOccurrence.Kind.CODE); + if (occurrence == null) { + occurrence = new WordOccurrence(fileText, myLexer.getTokenStart(), myLexer.getTokenEnd(), WordOccurrence.Kind.CODE); } else { - occurence.init(fileText, myLexer.getTokenStart(), myLexer.getTokenEnd(), WordOccurrence.Kind.CODE); + occurrence.init(fileText, myLexer.getTokenStart(), myLexer.getTokenEnd(), WordOccurrence.Kind.CODE); } - if (!processor.process(occurence)) return; + if (!processor.process(occurrence)) return; } else if (myCommentTokenSet.contains(type)) { - if (!stripWords(processor, fileText,myLexer.getTokenStart(),myLexer.getTokenEnd(), WordOccurrence.Kind.COMMENTS,occurence, false)) return; + if (!stripWords(processor, fileText,myLexer.getTokenStart(),myLexer.getTokenEnd(), WordOccurrence.Kind.COMMENTS,occurrence, false)) return; } else if (myLiteralTokenSet.contains(type)) { - if (!stripWords(processor, fileText, myLexer.getTokenStart(),myLexer.getTokenEnd(),WordOccurrence.Kind.LITERALS,occurence, myMayHaveFileRefsInLiterals)) return; + if (!stripWords(processor, fileText, myLexer.getTokenStart(),myLexer.getTokenEnd(),WordOccurrence.Kind.LITERALS,occurrence, myMayHaveFileRefsInLiterals)) return; } else { // process all word-like characters as words // Plugin writers may have (Maximka in JavaScript especially) some keyword token types omitted from the identifierTokenSet - if (!stripWords(processor, fileText, myLexer.getTokenStart(), myLexer.getTokenEnd(), WordOccurrence.Kind.CODE, occurence, false)) return; + if (!stripWords(processor, fileText, myLexer.getTokenStart(), myLexer.getTokenEnd(), WordOccurrence.Kind.CODE, occurrence, false)) return; } myLexer.advance(); } From 3455c92bde19fb6387ff9d162b5b299cedc9f55f Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 24 Jan 2012 13:43:35 +0400 Subject: [PATCH 22/28] IDEA-79352: PyCharm 2.0.1 shows nice error box for trac after test button --- .../src/com/intellij/tasks/trac/TracRepository.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java index 5ce6d6c4b299..136ed2161ebd 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java @@ -57,10 +57,8 @@ public class TracRepository extends BaseRepositoryImpl { String search = myDefaultSearch + "&max=" + max; if (myMaxSupported == null) { try { + myMaxSupported = true; result = runQuery(query, transport, client, search); - if (result != null) { - myMaxSupported = true; - } } catch (XmlRpcException e) { if (e.getMessage().contains("t.max")) { From 6774df98e8741d99595acda35e2f030ecf5b976c Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Wed, 25 Jan 2012 12:05:25 +0400 Subject: [PATCH 23/28] removed dependency on xml-rpc --- .../tasks/jira-connector/jira-connector.iml | 1 - .../tasks/jira/HttpClientTransport.java | 45 ------------------- 2 files changed, 46 deletions(-) delete mode 100644 plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/HttpClientTransport.java diff --git a/plugins/tasks/jira-connector/jira-connector.iml b/plugins/tasks/jira-connector/jira-connector.iml index e47df2880a1f..8be54150f15d 100644 --- a/plugins/tasks/jira-connector/jira-connector.iml +++ b/plugins/tasks/jira-connector/jira-connector.iml @@ -12,7 +12,6 @@ - diff --git a/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/HttpClientTransport.java b/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/HttpClientTransport.java deleted file mode 100644 index 669fd13e0bb9..000000000000 --- a/plugins/tasks/jira-connector/src/main/java/com/intellij/tasks/jira/HttpClientTransport.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.intellij.tasks.jira; - -import org.apache.commons.httpclient.Header; -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.HttpMethod; -import org.apache.commons.httpclient.methods.ByteArrayRequestEntity; -import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.xmlrpc.XmlRpc; -import org.apache.xmlrpc.XmlRpcClientException; -import org.apache.xmlrpc.XmlRpcTransport; - -import java.io.IOException; -import java.io.InputStream; - -public class HttpClientTransport implements XmlRpcTransport { - - private final String myUrl; - private final HttpClient myHttpClient; - private final Header myUserAgentHeader = new Header("User-Agent", XmlRpc.version); - private PostMethod myMethod; - - public HttpClientTransport(String url, HttpClient httpClient) { - myUrl = url; - myHttpClient = httpClient; - } - - public InputStream sendXmlRpc(byte[] request) throws IOException, XmlRpcClientException { - myMethod = new PostMethod(myUrl); - myMethod.setRequestHeader(new Header("Content-Type", "text/xml")); - myMethod.setRequestHeader(myUserAgentHeader); - myMethod.setRequestEntity(new ByteArrayRequestEntity(request)); - - configureMethod(myMethod); - - myHttpClient.executeMethod(myMethod); - return myMethod.getResponseBodyAsStream(); - } - - protected void configureMethod(HttpMethod method) { - } - - public void endClientRequest() throws XmlRpcClientException { - myMethod.releaseConnection(); - } -} From 272f420d1f95f3e4dd41201d5df3b46147dc197d Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 26 Jan 2012 14:44:02 +0400 Subject: [PATCH 24/28] setPlatformPrefix() extracted --- .../com/intellij/testFramework/PlatformTestCase.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java index 8ee4505c515a..d575d7df5019 100644 --- a/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/PlatformTestCase.java @@ -145,10 +145,10 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro if (resource == null) { resource = PlatformTestCase.class.getClassLoader().getResource("idea/IdeaApplicationInfo.xml"); if (resource == null) { - System.setProperty("idea.platform.prefix", "PlatformLangXml"); + setPlatformPrefix("PlatformLangXml"); } else { - System.setProperty("idea.platform.prefix", "Idea"); + setPlatformPrefix("Idea"); } } } @@ -742,11 +742,15 @@ public abstract class PlatformTestCase extends UsefulTestCase implements DataPro isUltimate = false; } if (!isUltimate) { - System.setProperty("idea.platform.prefix", prefix); + setPlatformPrefix(prefix); } } } + public static void setPlatformPrefix(String prefix) { + System.setProperty("idea.platform.prefix", prefix); + } + @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, ElementType.TYPE}) public @interface WrapInCommand {} From d35c11949ec275bceba2e31f551ad3c5bd710ed3 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 26 Jan 2012 17:48:29 +0400 Subject: [PATCH 25/28] IDEA-75975 Wrong coding in Open Task from --- .../intellij/tasks/trac/TracRepository.java | 11 ++-- plugins/tasks/tasks-tests/tasks-tests.iml | 2 + .../integration/TracIntegrationTest.java | 57 +++++++++++++++++++ 3 files changed, 65 insertions(+), 5 deletions(-) create mode 100644 plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/TracIntegrationTest.java diff --git a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java b/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java index 136ed2161ebd..a4cb3f78ca89 100644 --- a/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java +++ b/plugins/tasks/tasks-core/src/com/intellij/tasks/trac/TracRepository.java @@ -23,10 +23,7 @@ import com.intellij.tasks.impl.BaseRepositoryImpl; import com.intellij.tasks.impl.LocalTaskImpl; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.xmlb.annotations.Tag; -import org.apache.xmlrpc.CommonsXmlRpcTransport; -import org.apache.xmlrpc.XmlRpcClient; -import org.apache.xmlrpc.XmlRpcException; -import org.apache.xmlrpc.XmlRpcRequest; +import org.apache.xmlrpc.*; import org.jetbrains.annotations.Nullable; import java.io.IOException; @@ -41,6 +38,10 @@ import java.util.*; @SuppressWarnings({"UseOfObsoleteCollectionType", "unchecked"}) public class TracRepository extends BaseRepositoryImpl { + static { + XmlRpc.setDefaultInputEncoding("UTF-8"); + } + private String myDefaultSearch = "status!=closed&owner={username}&summary~={query}"; private Boolean myMaxSupported; @@ -96,7 +97,7 @@ public class TracRepository extends BaseRepositoryImpl { } private XmlRpcClient getRpcClient() throws MalformedURLException { - return new XmlRpcClient(new URL(getUrl())); + return new XmlRpcClient(getUrl()); } @Override diff --git a/plugins/tasks/tasks-tests/tasks-tests.iml b/plugins/tasks/tasks-tests/tasks-tests.iml index f59b8dfccb7e..668e75245368 100644 --- a/plugins/tasks/tasks-tests/tasks-tests.iml +++ b/plugins/tasks/tasks-tests/tasks-tests.iml @@ -14,6 +14,8 @@ + + diff --git a/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/TracIntegrationTest.java b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/TracIntegrationTest.java new file mode 100644 index 000000000000..61a0b8f76323 --- /dev/null +++ b/plugins/tasks/tasks-tests/test/com/intellij/tasks/integration/TracIntegrationTest.java @@ -0,0 +1,57 @@ +/* + * Copyright 2000-2012 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.tasks.integration; + +import com.intellij.tasks.Task; +import com.intellij.tasks.TaskManagerTestCase; +import com.intellij.tasks.trac.TracRepository; +import org.apache.xmlrpc.CommonsXmlRpcTransport; +import org.apache.xmlrpc.XmlRpc; +import org.apache.xmlrpc.XmlRpcClient; +import org.apache.xmlrpc.XmlRpcRequest; + +import java.net.URL; +import java.util.Arrays; +import java.util.Vector; + +/** + * @author Dmitry Avdeev + * Date: 1/25/12 + */ +public abstract class TracIntegrationTest extends TaskManagerTestCase { + + public void testTracEncoding() throws Exception { + + XmlRpc.setDefaultInputEncoding("UTF-8"); + XmlRpcClient client = new XmlRpcClient("http://trac.shopware.de/trac/login/rpc"); + // client.setBasicAuthentication(); + + CommonsXmlRpcTransport transport = new CommonsXmlRpcTransport(new URL("http://trac.shopware.de/trac/login/rpc")); + transport.setBasicAuthentication("jetbrains", "jetbrains"); + Object o = client.execute(new XmlRpcRequest("ticket.get", new Vector(Arrays.asList("5358"))), + transport); + + System.out.println(o); + + TracRepository repository = new TracRepository(); + repository.setPassword("jetbrains"); + repository.setUsername("jetbrains"); + repository.setUrl("http://trac.shopware.de/trac/login/rpc"); + Task[] issues = repository.getIssues("", 10, 0); + Task task = repository.findTask("5358"); + System.out.println(task.getDescription()); + } +} From 07371921553bd2ad2c757fc15bba9e1d337f2493 Mon Sep 17 00:00:00 2001 From: "Alexander.Podkhalyuzin" Date: Thu, 26 Jan 2012 18:33:34 +0400 Subject: [PATCH 26/28] Additional constructor to RequestHint.SmartStepFilter. --- .../com/intellij/debugger/engine/RequestHint.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java b/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java index 08bafc3e50cd..1a94cbc25ec4 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/RequestHint.java @@ -61,9 +61,16 @@ public class RequestHint { private boolean myMethodExecuted; public SmartStepFilter(PsiMethod psiMethod) { - myDeclaringClassName = JVMNameUtil.getJVMQualifiedName(psiMethod.getContainingClass()); - myTargetMethodName = psiMethod.isConstructor()? "" : psiMethod.getName(); - myTargetMethodSignature = JVMNameUtil.getJVMSignature(psiMethod); + this(JVMNameUtil.getJVMQualifiedName(psiMethod.getContainingClass()), + psiMethod.isConstructor()? "" : psiMethod.getName(), + JVMNameUtil.getJVMSignature(psiMethod)); + } + + public SmartStepFilter(@NotNull JVMName declaringClassName, @NonNls String targetMethodName, + @NotNull JVMName targetMethodSignature) { + myDeclaringClassName = declaringClassName; + myTargetMethodName = targetMethodName; + myTargetMethodSignature = targetMethodSignature; } public String getTargetMethodName() { From 904dc6fa98354446d1c5f41f0372b6e28a3aa744 Mon Sep 17 00:00:00 2001 From: "Maxim.Mossienko" Date: Thu, 26 Jan 2012 18:36:22 +0400 Subject: [PATCH 27/28] getMessage is not that costly when invoked via e.g. JavaErrorMessages.message(xxx); --- platform/util/src/com/intellij/AbstractBundle.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/platform/util/src/com/intellij/AbstractBundle.java b/platform/util/src/com/intellij/AbstractBundle.java index 9230d95e1776..0629b8f0c2f6 100644 --- a/platform/util/src/com/intellij/AbstractBundle.java +++ b/platform/util/src/com/intellij/AbstractBundle.java @@ -21,6 +21,7 @@ import com.intellij.util.containers.FactoryMap; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; +import java.lang.ref.Reference; import java.lang.ref.SoftReference; import java.util.Locale; import java.util.ResourceBundle; @@ -43,6 +44,7 @@ import java.util.ResourceBundle; * @since 8/1/11 2:37 PM */ public abstract class AbstractBundle { + private Reference myBundle; @NonNls private final String myPathToBundle; protected AbstractBundle(@NonNls @NotNull String pathToBundle) { @@ -54,7 +56,13 @@ public abstract class AbstractBundle { } private ResourceBundle getBundle() { - return getResourceBundle(myPathToBundle, getClass().getClassLoader()); + ResourceBundle bundle = null; + if (myBundle != null) bundle = myBundle.get(); + if (bundle == null) { + bundle = getResourceBundle(myPathToBundle, getClass().getClassLoader()); + myBundle = new SoftReference(bundle); + } + return bundle; } @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") From b9e202f42b7f7b4c1b343de67dcc28ad5ba0d368 Mon Sep 17 00:00:00 2001 From: Dmitry Boulytchev Date: Thu, 26 Jan 2012 19:04:39 +0400 Subject: [PATCH 28/28] Implementing incrementalization log (compiler server). --- .../jetbrains/jps/incremental/Builder.java | 22 ++++ .../dependencyView/DependencyContext.java | 4 +- .../ether/dependencyView/Logger.java | 2 +- .../ether/dependencyView/Mappings.java | 124 +++++++++++++----- 4 files changed, 114 insertions(+), 38 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/Builder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/Builder.java index 2c642f0df771..f7c24ef8c73b 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/Builder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/Builder.java @@ -1,11 +1,13 @@ package org.jetbrains.jps.incremental; +import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.ether.dependencyView.Mappings; import org.jetbrains.jps.Module; import org.jetbrains.jps.ModuleChunk; import org.jetbrains.jps.incremental.storage.SourceToOutputMapping; +import sun.util.LocaleServiceProviderPool; import java.io.File; import java.io.IOException; @@ -16,6 +18,8 @@ import java.util.*; * Date: 9/17/11 */ public abstract class Builder { + private static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.incremental.Builder"); + private static final Key> ALL_AFFECTED_FILES_KEY = Key.create("_all_affected_files_"); private static final Key> ALL_COMPILED_FILES_KEY = Key.create("_all_compiled_files_"); @@ -70,6 +74,24 @@ public abstract class Builder { delta, removedPaths, successfullyCompiled, allCompiledFiles, allAffectedFiles ); + if (LOG.isDebugEnabled()) { + LOG.debug("Differentiate Results:"); + + LOG.debug(" Compiled Files:"); + + for (final File c : allCompiledFiles) { + LOG.debug(" " + c.getAbsolutePath()); + } + + LOG.debug(" Affected Files:"); + + for (final File c : allAffectedFiles) { + LOG.debug(" " + c.getAbsolutePath()); + } + + LOG.debug("End Of Differentiate Results."); + } + if (incremental) { final Set newlyAffectedFiles = new HashSet(allAffectedFiles); newlyAffectedFiles.removeAll(affectedBeforeDif); diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/DependencyContext.java b/jps/model/src/org/jetbrains/ether/dependencyView/DependencyContext.java index c3c796f349de..d8af32122f35 100644 --- a/jps/model/src/org/jetbrains/ether/dependencyView/DependencyContext.java +++ b/jps/model/src/org/jetbrains/ether/dependencyView/DependencyContext.java @@ -172,9 +172,9 @@ class DependencyContext { public Logger getLogger(final com.intellij.openapi.diagnostic.Logger log) { return new Logger() { @Override - public void debug(S s) { + public void debug(String comment, S s) { if (log.isDebugEnabled()) { - log.debug(getValue(s)); + log.debug(comment + getValue(s)); } } }; diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/Logger.java b/jps/model/src/org/jetbrains/ether/dependencyView/Logger.java index 20ffdf19d8f4..dbd95bb3a256 100644 --- a/jps/model/src/org/jetbrains/ether/dependencyView/Logger.java +++ b/jps/model/src/org/jetbrains/ether/dependencyView/Logger.java @@ -23,5 +23,5 @@ package org.jetbrains.ether.dependencyView; * To change this template use File | Settings | File Templates. */ public interface Logger { - void debug(T t); + void debug(String comment, T t); } diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java index 43bde0ea86f3..3b7c6fe7fa5a 100644 --- a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java +++ b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java @@ -42,8 +42,8 @@ public class Mappings { LOG.debug(s); } - private void debug(final DependencyContext.S s) { - myDebugS.debug(s); + private void debug(final String comment, final DependencyContext.S s) { + myDebugS.debug(comment, s); } private MultiMaplet myClassToSubclasses; @@ -534,16 +534,25 @@ public class Mappings { final Collection affectedUsages, final Collection dependants, final boolean usages) { + debug("Affecting subclasses of class: ", className); + final DependencyContext.S fileName = myClassToSourceFile.get(className); if (fileName == null) { + debug("No source file detected for class ", className); + debug("End of affectSubclasses"); return; } + debug("Source file name: ", fileName); + if (usages) { + debug("Class usages affection requested"); + final ClassRepr classRepr = reprByName(className); if (classRepr != null) { + debug("Added class usage for ", classRepr.name); affectedUsages.add(classRepr.createUsage()); } } @@ -730,32 +739,38 @@ public class Mappings { // Public branch --- hopeless if ((member.access & Opcodes.ACC_PUBLIC) > 0) { - debug("Switched to non-incremental mode"); + debug("Public access, switching to a non-incremental mode"); return false; } // Protected branch if ((member.access & Opcodes.ACC_PROTECTED) > 0) { - debug("Softening non-incremental decision: adding all relevant subclasses for a recompilation"); + debug("Protected access, softening non-incremental decision: adding all relevant subclasses for a recompilation"); + debug("Root class: ", owner); final Collection propagated = self.propagateFieldAccess(isField ? member.name : myContext.get(""), owner); for (DependencyContext.S className : propagated) { - affectedFiles.add(new File(myContext.getValue(myClassToSourceFile.get(className)))); + final String fileName = myContext.getValue(myClassToSourceFile.get(className)); + debug("Adding " + fileName); + affectedFiles.add(new File(fileName)); } } - debug("Softening non-incremental decision: adding all package classes for a recompilation"); - final String packageName = ClassRepr.getPackageName(myContext.getValue(isField ? owner : member.name)); - + + debug("Softening non-incremental decision: adding all package classes for a recompilation"); + debug("Package name: " + packageName); + // Package-local branch for (Map.Entry e : myClassToSourceFile.entrySet()) { final DependencyContext.S className = e.getKey(); final DependencyContext.S fileName = e.getValue(); if (ClassRepr.getPackageName(myContext.getValue(className)).equals(packageName)) { - affectedFiles.add(new File(myContext.getValue(fileName))); + final String f = myContext.getValue(fileName); + debug("Adding: " + f); + affectedFiles.add(new File(f)); } } @@ -767,6 +782,8 @@ public class Mappings { final Collection filesToCompile, final Collection compiledFiles, final Collection affectedFiles) { + debug("Begin of Differentiate:"); + delta.compensateRemovedContent(filesToCompile); final Util u = new Util(delta); @@ -798,14 +815,12 @@ public class Mappings { final Difference.Specifier classDiff = Difference.make(pastClasses, classes); - debug("Processing changed classes"); - + debug("Processing changed classes:"); for (Pair changed : classDiff.changed()) { final ClassRepr it = changed.first; final ClassRepr.Diff diff = (ClassRepr.Diff)changed.second; - debug("Changed: "); - debug(it.name); + debug("Changed: ", it.name); final int addedModifiers = diff.addedModifiers(); final int removedModifiers = diff.removedModifiers(); @@ -815,24 +830,34 @@ public class Mappings { final boolean signatureChanged = (diff.base() & Difference.SIGNATURE) > 0; if (superClassChanged || interfacesChanged || signatureChanged) { + debug("Superclass changed: " + superClassChanged); + debug("Interfaces changed: " + interfacesChanged); + debug("Signature changed " + signatureChanged); + final boolean extendsChanged = superClassChanged && !diff.extendsAdded(); final boolean interfacesRemoved = interfacesChanged && !diff.interfaces().removed().isEmpty(); + debug("Extends changed: " + extendsChanged); + debug("Interfaces removed: " + interfacesRemoved); + u.affectSubclasses(it.name, affectedFiles, affectedUsages, dependants, extendsChanged || interfacesRemoved || signatureChanged); } if ((diff.addedModifiers() & Opcodes.ACC_INTERFACE) > 0 || (diff.removedModifiers() & Opcodes.ACC_INTERFACE) > 0) { + debug("Class-to-interface or interface-to-class conversion detected, added class usage to affected usages"); affectedUsages.add(it.createUsage()); } if (it.isAnnotation() && it.policy == RetentionPolicy.SOURCE) { debug("Annotation, retention policy = SOURCE => a switch to non-incremental mode requested"); if (!incrementalDecision(it.outerClassName, it, affectedFiles)) { + debug("End of Differentiate, returning false"); return false; } } if ((addedModifiers & Opcodes.ACC_PROTECTED) > 0) { + debug("Introduction of 'protected' modifier detected, adding class usage + inheritance constraint to affected usages"); final UsageRepr.Usage usage = it.createUsage(); affectedUsages.add(usage); @@ -840,6 +865,7 @@ public class Mappings { } if (diff.packageLocalOn()) { + debug("Introduction of 'package local' access detected, adding class usage + package constraint to affected usages"); final UsageRepr.Usage usage = it.createUsage(); affectedUsages.add(usage); @@ -847,46 +873,52 @@ public class Mappings { } if ((addedModifiers & Opcodes.ACC_FINAL) > 0 || (addedModifiers & Opcodes.ACC_PRIVATE) > 0) { + debug("Introduction of 'private' or 'final' modifier(s) detected, adding class usage to affected usages"); affectedUsages.add(it.createUsage()); } - if ((addedModifiers & Opcodes.ACC_ABSTRACT) > 0) { - affectedUsages.add(UsageRepr.createClassNewUsage(myContext, it.name)); - } - - if ((addedModifiers & Opcodes.ACC_STATIC) > 0 || - (removedModifiers & Opcodes.ACC_STATIC) > 0 || - (addedModifiers & Opcodes.ACC_ABSTRACT) > 0) { + if ((addedModifiers & Opcodes.ACC_ABSTRACT) > 0 || (addedModifiers & Opcodes.ACC_STATIC) > 0) { + debug("Introduction of 'abstract' or 'static' modifier(s) detected, adding class new usage to affected usages"); affectedUsages.add(UsageRepr.createClassNewUsage(myContext, it.name)); } if (it.isAnnotation()) { + debug("Class is annotation, performing annotation-specific analysis"); + if (diff.retentionChanged()) { + debug("Retention policy change detected, adding class usage to affected usages"); affectedUsages.add(it.createUsage()); } else { final Collection removedtargets = diff.targets().removed(); if (removedtargets.contains(ElementType.LOCAL_VARIABLE)) { - debug("Annotation, removed target contains LOCAL_VARIABLE => a switch to non-incremental mode requested"); + debug("Removed target contains LOCAL_VARIABLE => a switch to non-incremental mode requested"); if (!incrementalDecision(it.outerClassName, it, affectedFiles)) { + debug("End of Differentiate, returning false"); return false; } } if (!removedtargets.isEmpty()) { + debug("Removed some annotation targets, adding annotation query"); annotationQuery.add((UsageRepr.AnnotationUsage)UsageRepr .createAnnotationUsage(myContext, TypeRepr.createClassType(myContext, it.name), null, removedtargets)); } for (MethodRepr m : diff.methods().added()) { if (!m.hasValue()) { + debug("Added method with no default value: " + m.name); + debug("Adding class usage to affected usages"); affectedUsages.add(it.createUsage()); } } } + + debug("End of annotation-specific analysis"); } + debug("Processing added methods: "); for (MethodRepr m : diff.methods().added()) { if (it.isAnnotation()) { continue; @@ -984,7 +1016,9 @@ public class Mappings { } } } - + debug("End of added methods processing"); + + debug("Processing removed methods:"); for (MethodRepr m : diff.methods().removed()) { final Collection> overridenMethods = u.findOverridenMethods(m, it); final Collection propagated = u.propagateMethodAccess(m.name, it.name); @@ -1053,7 +1087,9 @@ public class Mappings { } } } - + debug("End of removed methods processing"); + + debug("Processing changed methods:"); for (Pair mr : diff.methods().changed()) { final MethodRepr m = mr.first; final MethodRepr.Diff d = (MethodRepr.Diff)mr.second; @@ -1129,9 +1165,11 @@ public class Mappings { } } } - + debug("End of changed methods processing"); + final int mask = Opcodes.ACC_STATIC | Opcodes.ACC_FINAL; + debug("Processing added fields"); for (FieldRepr f : diff.fields().added()) { final boolean fPrivate = (f.access & Opcodes.ACC_PRIVATE) > 0; final boolean fProtected = (f.access & Opcodes.ACC_PROTECTED) > 0; @@ -1214,16 +1252,16 @@ public class Mappings { } } } - - debug("Processing removed fields"); - + debug("End of added fields processing"); + + debug("Processing removed fields:"); for (FieldRepr f : diff.fields().removed()) { - debug("Field "); - debug(f.name); + debug("Field: ", it.name); if ((f.access & Opcodes.ACC_PRIVATE) == 0 && (f.access & mask) == mask && f.hasValue()) { debug("Field had value and was (non-private) final static => a switch to non-incremental mode requested"); if (!incrementalDecision(it.name, f, affectedFiles)) { + debug("End of Differentiate, returning false"); return false; } } @@ -1231,20 +1269,20 @@ public class Mappings { final Collection propagated = u.propagateFieldAccess(f.name, it.name); u.affectFieldUsages(f, propagated, f.createUsage(myContext, it.name), affectedUsages, dependants); } + debug("End of removed fields processing"); - debug("Processing changed fields"); - + debug("Processing changed fields:"); for (Pair f : diff.fields().changed()) { final Difference d = f.second; final FieldRepr field = f.first; - debug("Field "); - debug(field.name); + debug("Field: ", it.name); if ((field.access & Opcodes.ACC_PRIVATE) == 0 && (field.access & mask) == mask) { if ((d.base() & Difference.ACCESS) > 0 || (d.base() & Difference.VALUE) > 0) { debug("Inline field changed it's access or value => a switch to non-incremental mode requested"); if (!incrementalDecision(it.name, field, affectedFiles)){ + debug("End of Differentiate, returning false"); return false; } } @@ -1293,12 +1331,18 @@ public class Mappings { } } } + debug("End of changed fields processing"); } - + debug("End of changed classes processing"); + + debug("Processing removed classes:"); for (ClassRepr c : classDiff.removed()) { + debug("Adding usages of class ", c.name); affectedUsages.add(c.createUsage()); } + debug("End of removed classes processing."); + debug("Processing added classes:"); for (ClassRepr c : classDiff.added()) { final Collection depClasses = myClassToClassDependency.get(c.name); @@ -1307,12 +1351,16 @@ public class Mappings { final DependencyContext.S fName = myClassToSourceFile.get(depClass); if (fName != null) { - affectedFiles.add(new File(myContext.getValue(fName))); + final String f = myContext.getValue(fName); + debug("Adding dependent file " + f); + affectedFiles.add(new File(f)); } } } } + debug("End of added classes processing."); + debug("Checking dependent files:"); if (dependants != null) { final Set dependentFiles = new HashSet(); @@ -1332,6 +1380,8 @@ public class Mappings { continue filewise; } + debug("Dependent file: " + theFile.getAbsolutePath()); + final Collection depClusters = mySourceFileToUsages.get(depFile); for (UsageRepr.Cluster depCluster : depClusters) { @@ -1347,6 +1397,7 @@ public class Mappings { final Util.UsageConstraint constraint = usageConstraints.get(usage); if (constraint == null) { + debug("Added file with no constraints"); affectedFiles.add(theFile); continue filewise; } @@ -1354,6 +1405,7 @@ public class Mappings { final Set residenceClasses = depCluster.getResidence(usage); for (DependencyContext.S residentName : residenceClasses) { if (constraint.checkResidence(residentName)) { + debug("Added file with satisfied constraint"); affectedFiles.add(theFile); continue filewise; } @@ -1369,6 +1421,7 @@ public class Mappings { for (UsageRepr.Usage usage : annotationUsages) { for (UsageRepr.AnnotationUsage query : annotationQuery) { if (query.satisfies(usage)) { + debug("Added file due to annotation query"); affectedFiles.add(theFile); continue filewise; } @@ -1381,6 +1434,7 @@ public class Mappings { } } + debug("End of Differentiate, returning true"); return true; }