From eff35de2d5fc8c9cf46e17d482cd189f23d83bbe Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 21 Aug 2012 11:50:53 +0200 Subject: [PATCH 01/27] don't rename action to "close projects in current window" if we have only one project --- .../src/com/intellij/ide/actions/CloseProjectAction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java index 9b5e6d52bb24..83ed053bf969 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CloseProjectAction.java @@ -21,6 +21,7 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.Presentation; +import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.DumbAware; import com.intellij.projectImport.ProjectAttachProcessor; @@ -38,8 +39,11 @@ public class CloseProjectAction extends AnAction implements DumbAware { Presentation presentation = event.getPresentation(); Project project = event.getData(PlatformDataKeys.PROJECT); presentation.setEnabled(project != null); - if (ProjectAttachProcessor.canAttachToProject()) { + if (ProjectAttachProcessor.canAttachToProject() && project != null && ModuleManager.getInstance(project).getModules().length > 1) { presentation.setText("Close Projects in Current Window"); } + else { + presentation.setText(getTemplatePresentation().getText()); + } } } From 756147618c54080cb5d1549a893064382b6eb4f7 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 21 Aug 2012 11:53:13 +0200 Subject: [PATCH 02/27] typos in javadoc --- .../lang-api/src/com/intellij/lang/ImportOptimizer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/lang-api/src/com/intellij/lang/ImportOptimizer.java b/platform/lang-api/src/com/intellij/lang/ImportOptimizer.java index cea4dd8c38a6..2e2f12af1d0f 100644 --- a/platform/lang-api/src/com/intellij/lang/ImportOptimizer.java +++ b/platform/lang-api/src/com/intellij/lang/ImportOptimizer.java @@ -20,7 +20,7 @@ import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; /** - * Implementors of the interface encapsulate optimize imports process for the language. + * Implementers of the interface encapsulate optimize imports process for the language. * Should be registered as "com.intellij.lang.importOptimizer" extension. * @author max * @see LanguageImportStatements @@ -35,13 +35,13 @@ public interface ImportOptimizer { boolean supports(PsiFile file); /** - * Implementors of the method are expected to perform all necessary calculations synchronously and return a Runnable, + * Implementers of the method are expected to perform all necessary calculations synchronously and return a Runnable, * which performs modifications based on preprocessing results. - * processFile() is guaranteed to run with {@link com.intellij.openapi.application.Application#runReadAction(Runnable)} priviledges and + * processFile() is guaranteed to run with {@link com.intellij.openapi.application.Application#runReadAction(Runnable)} privileges and * the Runnable returned is guaranteed to run with {@link com.intellij.openapi.application.Application#runWriteAction(Runnable)} privileges. * * One can theoretically delay all the calculation until Runnable is called but this code will be executed in Swing thread thus - * lenghty calculations may block user interface for some significant time. + * lengthy calculations may block user interface for some significant time. * * @param file to optimize an imports in. It's guaranteed to have a language this ImportOptimizer have been * issued from. From a90da9fe37dcd3b81819606d3fc1862300fdd110 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 21 Aug 2012 15:30:18 +0400 Subject: [PATCH 03/27] fix testdata --- .../lambda2anonymous/InsertFinal_after.java | Bin 576 -> 446 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/lambda2anonymous/InsertFinal_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/lambda2anonymous/InsertFinal_after.java index 5981f26eb7b86a017a0b5e9b7dcf38358e2afb68..4b5d8fe162f30fc46b2a5534050aed4f40a20d59 100644 GIT binary patch delta 7 OcmX@WvX6PgK1Kixt^)M{ delta 139 VcmdnTe1K)cKE`^6fd$M!>jBi019t!b From 58c7f8a16602d91072d686ce4daf87ad37508bbc Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 21 Aug 2012 15:48:06 +0400 Subject: [PATCH 04/27] use our own 'lastModified' method to get accurate values on Linux --- .../src/org/jetbrains/jps/incremental/FSOperations.java | 3 ++- .../incremental/artifacts/ArtifactSourceFilesState.java | 3 ++- .../jps/incremental/artifacts/impl/JarsBuilder.java | 3 ++- .../src/org/jetbrains/jps/incremental/fs/BuildFSState.java | 7 ++++--- .../testSrc/org/jetbrains/ether/IncrementalTestCase.java | 2 +- .../jps/incremental/artifacts/ArtifactBuilderTestCase.java | 3 ++- .../src/com/intellij/openapi/util/io/FileSystemUtil.java | 5 +++++ 7 files changed, 18 insertions(+), 8 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java index 4f00807fcf5e..0c8f95c1944a 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java @@ -1,5 +1,6 @@ package org.jetbrains.jps.incremental; +import com.intellij.openapi.util.io.FileSystemUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.JpsPathUtil; @@ -173,7 +174,7 @@ public class FSOperations { else { // is file boolean markDirty = forceDirty; if (!markDirty) { - markDirty = tsStorage.getStamp(file) != file.lastModified(); + markDirty = tsStorage.getStamp(file) != FileSystemUtil.lastModified(file); } if (markDirty) { // if it is full project rebuild, all storages are already completely cleared; diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/ArtifactSourceFilesState.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/ArtifactSourceFilesState.java index 897e84d43ce3..d823ace288b8 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/ArtifactSourceFilesState.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/ArtifactSourceFilesState.java @@ -1,6 +1,7 @@ package org.jetbrains.jps.incremental.artifacts; import com.intellij.openapi.util.Pair; +import com.intellij.openapi.util.io.FileSystemUtil; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.Nullable; import org.jetbrains.jps.cmdline.ProjectDescriptor; @@ -117,7 +118,7 @@ public class ArtifactSourceFilesState extends CompositeStorageOwner { boolean upToDate = false; if (!forceMarkDirty && state != null) { for (ArtifactSourceTimestampStorage.PerArtifactTimestamp artifactTimestamp : state) { - if (artifactTimestamp.myArtifactId == myArtifactId && artifactTimestamp.myTimestamp == file.lastModified()) { + if (artifactTimestamp.myArtifactId == myArtifactId && artifactTimestamp.myTimestamp == FileSystemUtil.lastModified(file)) { upToDate = true; break; } diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JarsBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JarsBuilder.java index 6bc6206f3f6b..38a509294f34 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JarsBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/impl/JarsBuilder.java @@ -19,6 +19,7 @@ package org.jetbrains.jps.incremental.artifacts.impl; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; +import com.intellij.openapi.util.io.FileSystemUtil; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.ArrayUtil; @@ -261,7 +262,7 @@ public class JarsBuilder { private static void extractFileAndAddToJar(final JarOutputStream jarOutputStream, final JarBasedArtifactRootDescriptor root, final String relativeOutputPath, final Set writtenPaths) throws IOException { - final long timestamp = root.getRootFile().lastModified(); + final long timestamp = FileSystemUtil.lastModified(root.getRootFile()); root.processEntries(new JarBasedArtifactRootDescriptor.EntryProcessor() { @Override public void process(@Nullable InputStream inputStream, @NotNull String relativePath) throws IOException { diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java index 28a81d3bff4c..e87651742f37 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/fs/BuildFSState.java @@ -2,6 +2,7 @@ package org.jetbrains.jps.incremental.fs; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Key; +import com.intellij.openapi.util.io.FileSystemUtil; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -165,7 +166,7 @@ public class BuildFSState extends FSState { for (File file : files) { if (!excludes.isExcluded(file)) { if (scope.isAffected(rd.module, file)) { - final long stamp = file.lastModified(); + final long stamp = FileSystemUtil.lastModified(file); if (!rd.isGeneratedSources && stamp > compilationStartStamp) { // if the file was modified after the compilation had started, // do not save the stamp considering file dirty @@ -202,8 +203,8 @@ public class BuildFSState extends FSState { if (paths != null) { for (String path : paths) { File file = new File(FileUtil.toSystemDependentName(path)); - long stamp = file.lastModified(); - if (stamp > compilationStartStamp + 1000) {//todo[nik] this is added to fix tests on Linux + long stamp = FileSystemUtil.lastModified(file); + if (stamp > compilationStartStamp + 1000) {//todo[nik] do we really need this? delta.markRecompile(descriptor.getRootIndex(), path); } else { diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java index d9237489caef..89984eb56125 100644 --- a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java +++ b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java @@ -144,7 +144,7 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase { true, false).assertSuccessful(); modify(); - if (SystemInfo.isUnix) { + if (SystemInfo.isMac) {//todo[nik] check if FileSystemUtil.lastModified return accurate result for mac and remove this Thread.sleep(1000L); } diff --git a/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTestCase.java b/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTestCase.java index f6df9a21c523..9389683da630 100644 --- a/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTestCase.java +++ b/jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTestCase.java @@ -16,6 +16,7 @@ package org.jetbrains.jps.incremental.artifacts; import com.intellij.openapi.application.PathManager; +import com.intellij.openapi.util.io.FileSystemUtil; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.io.TestFileSystemBuilder; import com.intellij.util.text.UniqueNameGenerator; @@ -183,7 +184,7 @@ public abstract class ArtifactBuilderTestCase extends JpsBuildTestCase { if (newContent != null) { FileUtil.writeToFile(file, newContent); } - boolean updated = file.setLastModified(file.lastModified() + 1000); + boolean updated = file.setLastModified(FileSystemUtil.lastModified(file) + 10); assertTrue("Cannot modify timestamp for " + file.getAbsolutePath(), updated); } catch (IOException e) { 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 692216d090f2..7246d2cadc68 100644 --- a/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/FileSystemUtil.java @@ -137,6 +137,11 @@ public class FileSystemUtil { return getAttributes(file.getPath()); } + public static long lastModified(@NotNull File file) { + FileAttributes attributes = getAttributes(file); + return attributes != null ? attributes.lastModified : 0; + } + public static boolean isSymLink(@NotNull final String path) { if (SystemInfo.areSymLinksSupported) { final FileAttributes attributes = getAttributes(path); From 9a5cb4776dcfec248ac283400d8b4fc152427e04 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Fri, 17 Aug 2012 20:51:23 +0400 Subject: [PATCH 05/27] use rich CreateResourceFile dialog when extracting layout --- .../propertyTable/editors/ResourceDialog.java | 2 +- .../CreateResourceDirectoryDialog.java | 2 +- .../actions/CreateResourceFileAction.java | 19 +++- .../actions/CreateResourceFileDialog.java | 13 ++- .../CreateFileResourceQuickFix.java | 2 +- .../AndroidExtractAsIncludeAction.java | 107 +++++------------- .../uipreview/DeviceConfiguratorPanel.java | 26 ++--- .../uipreview/EditConfigurationDialog.java | 5 +- 8 files changed, 74 insertions(+), 102 deletions(-) diff --git a/plugins/android-designer/src/com/intellij/android/designer/propertyTable/editors/ResourceDialog.java b/plugins/android-designer/src/com/intellij/android/designer/propertyTable/editors/ResourceDialog.java index a7a912c00be6..4a8890606b46 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/propertyTable/editors/ResourceDialog.java +++ b/plugins/android-designer/src/com/intellij/android/designer/propertyTable/editors/ResourceDialog.java @@ -245,7 +245,7 @@ public class ResourceDialog extends DialogWrapper implements TreeSelectionListen private void createNewResourceFile(ResourceType resourceType) { AndroidFacet facet = AndroidFacet.getInstance(myModule); - XmlFile newFile = CreateResourceFileAction.createFileResource(facet, resourceType, null, true); + XmlFile newFile = CreateResourceFileAction.createFileResource(facet, resourceType, null, null, null, true); if (newFile != null) { String name = newFile.getName(); diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.java b/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.java index d88fc300b483..97e62dc76245 100644 --- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.java +++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceDirectoryDialog.java @@ -59,7 +59,7 @@ public abstract class CreateResourceDirectoryDialog extends DialogWrapper { } }); - myDeviceConfiguratorPanel = new DeviceConfiguratorPanel(null) { + myDeviceConfiguratorPanel = new DeviceConfiguratorPanel() { @Override public void applyEditors() { try { diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileAction.java b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileAction.java index c43e5892ec48..644e2ea82bac 100644 --- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileAction.java +++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileAction.java @@ -17,6 +17,7 @@ package org.jetbrains.android.actions; import com.android.AndroidConstants; +import com.android.ide.common.resources.configuration.FolderConfiguration; import com.android.resources.ResourceType; import com.intellij.CommonBundle; import com.intellij.ide.actions.CreateElementActionBase; @@ -96,8 +97,11 @@ public class CreateResourceFileAction extends CreateElementActionBase { public static XmlFile createFileResource(@NotNull AndroidFacet facet, @NotNull final ResourceType resType, @Nullable String resName, + @Nullable String rootElement, + @Nullable FolderConfiguration config, boolean chooseResName) { - final PsiElement[] elements = doCreateFileResource(facet, resType, resName, chooseResName); + final PsiElement[] elements = doCreateFileResource(facet, resType, resName, rootElement, + config, chooseResName); if (elements.length == 0) { return null; } @@ -109,6 +113,8 @@ public class CreateResourceFileAction extends CreateElementActionBase { private static PsiElement[] doCreateFileResource(@NotNull AndroidFacet facet, @NotNull final ResourceType resType, @Nullable String resName, + @Nullable String rootElement, + @Nullable FolderConfiguration config, boolean chooseResName) { final CreateResourceFileAction action = getInstance(); @@ -119,8 +125,8 @@ public class CreateResourceFileAction extends CreateElementActionBase { selectedModule = facet.getModule(); } else { - final MyDialog dialog = - new MyDialog(facet, action.mySubactions.values(), resType, resName, chooseResName, action, facet.getModule(), true); + final MyDialog dialog = new MyDialog(facet, action.mySubactions.values(), resType, resName, rootElement, + config, chooseResName, action, facet.getModule(), true); dialog.show(); if (!dialog.isOK()) { return PsiElement.EMPTY_ARRAY; @@ -165,7 +171,7 @@ public class CreateResourceFileAction extends CreateElementActionBase { LOG.assertTrue(facet != null); final MyDialog dialog = - new MyDialog(facet, mySubactions.values(), null, null, true, CreateResourceFileAction.this, facet.getModule(), false) { + new MyDialog(facet, mySubactions.values(), null, null, null, null, true, CreateResourceFileAction.this, facet.getModule(), false) { @Override protected InputValidator createValidator(@NotNull String subdirName) { return CreateResourceFileAction.this.createValidator(project, directory, subdirName); @@ -240,11 +246,14 @@ public class CreateResourceFileAction extends CreateElementActionBase { Collection actions, @Nullable ResourceType predefinedResourceType, @Nullable String predefinedFileName, + @Nullable String predefinedRootElement, + @Nullable FolderConfiguration predefinedConfig, boolean chooseFileName, @NotNull CreateResourceFileAction action, @NotNull Module module, boolean chooseModule) { - super(facet, actions, predefinedResourceType, predefinedFileName, chooseFileName, module, chooseModule); + super(facet, actions, predefinedResourceType, predefinedFileName, predefinedRootElement, + predefinedConfig, chooseFileName, module, chooseModule); myAction = action; } diff --git a/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java index 50137e580186..fd138795890c 100644 --- a/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java +++ b/plugins/android/src/org/jetbrains/android/actions/CreateResourceFileDialog.java @@ -80,6 +80,8 @@ public class CreateResourceFileDialog extends DialogWrapper { Collection actions, @Nullable ResourceType predefinedResourceType, @Nullable String predefinedFileName, + @Nullable String predefinedRootElement, + @Nullable FolderConfiguration predefinedConfig, boolean chooseFileName, @NotNull Module module, boolean chooseModule) { @@ -111,7 +113,7 @@ public class CreateResourceFileDialog extends DialogWrapper { } } - myDeviceConfiguratorPanel = new DeviceConfiguratorPanel(null) { + myDeviceConfiguratorPanel = new DeviceConfiguratorPanel() { @Override public void applyEditors() { try { @@ -137,6 +139,9 @@ public class CreateResourceFileDialog extends DialogWrapper { setOKActionEnabled(myDirectoryNameTextField.getText().length() > 0); } }; + if (predefinedConfig != null) { + myDeviceConfiguratorPanel.init(predefinedConfig); + } myResourceTypeCombo.getComboBox().addActionListener(new ActionListener() { @Override @@ -191,6 +196,12 @@ public class CreateResourceFileDialog extends DialogWrapper { myDeviceConfiguratorWrapper.add(myDeviceConfiguratorPanel, BorderLayout.CENTER); setOKActionEnabled(myDirectoryNameTextField.getText().length() > 0); updateRootElementTextField(); + + if (predefinedRootElement != null) { + myRootElementLabel.setVisible(false); + myRootElementFieldWrapper.setVisible(false); + myRootElementField.setText(predefinedRootElement); + } init(); setTitle(AndroidBundle.message("new.resource.dialog.title")); diff --git a/plugins/android/src/org/jetbrains/android/inspections/CreateFileResourceQuickFix.java b/plugins/android/src/org/jetbrains/android/inspections/CreateFileResourceQuickFix.java index fee6d203a052..ba3a1eaa5874 100644 --- a/plugins/android/src/org/jetbrains/android/inspections/CreateFileResourceQuickFix.java +++ b/plugins/android/src/org/jetbrains/android/inspections/CreateFileResourceQuickFix.java @@ -74,7 +74,7 @@ public class CreateFileResourceQuickFix implements LocalQuickFix, IntentionActio @Override public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException { final XmlFile newFile = - CreateResourceFileAction.createFileResource(myFacet, myResourceType, myResourceName + ".xml", myChooseResName); + CreateResourceFileAction.createFileResource(myFacet, myResourceType, myResourceName + ".xml", null, null, myChooseResName); if (newFile != null) { UndoUtil.markPsiFileForUndo(myFile); } diff --git a/plugins/android/src/org/jetbrains/android/refactoring/AndroidExtractAsIncludeAction.java b/plugins/android/src/org/jetbrains/android/refactoring/AndroidExtractAsIncludeAction.java index dd0eb1d31392..eaccc506f334 100644 --- a/plugins/android/src/org/jetbrains/android/refactoring/AndroidExtractAsIncludeAction.java +++ b/plugins/android/src/org/jetbrains/android/refactoring/AndroidExtractAsIncludeAction.java @@ -1,12 +1,13 @@ package org.jetbrains.android.refactoring; +import com.android.AndroidConstants; +import com.android.ide.common.resources.configuration.FolderConfiguration; import com.android.resources.ResourceType; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.command.UndoConfirmationPolicy; -import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.editor.Document; 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.io.FileUtil; import com.intellij.psi.*; @@ -15,16 +16,14 @@ 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.util.IncorrectOperationException; import com.intellij.util.containers.HashSet; import com.intellij.util.xml.DomElement; import com.intellij.util.xml.DomManager; +import org.jetbrains.android.actions.CreateResourceFileAction; import org.jetbrains.android.dom.layout.Include; import org.jetbrains.android.dom.layout.LayoutViewElement; import org.jetbrains.android.facet.AndroidFacet; -import org.jetbrains.android.util.AndroidBundle; import org.jetbrains.android.util.AndroidCommonUtils; -import org.jetbrains.android.util.AndroidUtils; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -42,6 +41,7 @@ public class AndroidExtractAsIncludeAction extends AndroidBaseLayoutRefactoringA private final MyTestConfig myTestConfig; + @SuppressWarnings("UnusedDeclaration") public AndroidExtractAsIncludeAction() { myTestConfig = null; } @@ -134,57 +134,40 @@ public class AndroidExtractAsIncludeAction extends AndroidBaseLayoutRefactoringA final List tagsInRange = collectAllTags(from, to); assert tagsInRange.size() > 0 : "there is no tag inside the range"; + final String fileName = myTestConfig != null ? myTestConfig.myLayoutFileName : null; + final String dirName = dir.getName(); + final FolderConfiguration config = dirName.length() > 0 + ? FolderConfiguration.getConfig(dirName.split(AndroidConstants.RES_QUALIFIER_SEP)) + : null; - final String title = AndroidBundle.message("android.extract.as.include.title"); - final String fileName; - - if (myTestConfig != null) { - fileName = myTestConfig.myLayoutFileName; - } - else { - fileName = Messages.showInputDialog(project, "Enter new layout file name", title, Messages.getQuestionIcon(), - null, new MyInputValidatorEx(dir)); - } - - if (fileName == null) { - return; - } - final String fileName1 = addXmlExtensionIfNecessary(fileName); - - new WriteCommandAction.Simple(project, "Extract '" + fileName1 + "' layout", file) { + CommandProcessor.getInstance().executeCommand(project, new Runnable() { @Override - protected void run() throws Throwable { - doRefactor(project, file, from, to, dir, parentTag, fileName1, tagsInRange.size() > 1); - } + public void run() { + final XmlFile newFile = + CreateResourceFileAction.createFileResource(facet, ResourceType.LAYOUT, fileName, "temp_root", config, true); - @Override - protected UndoConfirmationPolicy getUndoConfirmationPolicy() { - return UndoConfirmationPolicy.REQUEST_CONFIRMATION; + if (newFile != null) { + ApplicationManager.getApplication().runWriteAction(new Runnable() { + @Override + public void run() { + doRefactor(facet, file, newFile, from, to, parentTag, tagsInRange.size() > 1); + } + }); + } } - }.execute(); + }, "Extract Android Layout", null, UndoConfirmationPolicy.REQUEST_CONFIRMATION); } - private static void doRefactor(Project project, + private static void doRefactor(AndroidFacet facet, PsiFile file, + XmlFile newFile, PsiElement from, PsiElement to, - PsiDirectory dir, XmlTag parentTag, - String fileName, boolean wrapWithMerge) { + final Project project = facet.getModule().getProject(); final String textToExtract = file.getText().substring(from.getTextRange().getStartOffset(), to.getTextRange().getEndOffset()); - final XmlFile newFile; - try { - final PsiFile f = dir.createFile(fileName); - assert f instanceof XmlFile; - newFile = (XmlFile)f; - } - catch (Exception e) { - AndroidUtils.reportError(project, e.getClass().getName() + ": " + e.getMessage(), - AndroidBundle.message("android.extract.as.include.title")); - return; - } final PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project); final Document document = documentManager.getDocument(newFile); assert document != null; @@ -236,7 +219,7 @@ public class AndroidExtractAsIncludeAction extends AndroidBaseLayoutRefactoringA } } } - final String resourceName = AndroidCommonUtils.getResourceName(ResourceType.LAYOUT.getName(), fileName); + final String resourceName = AndroidCommonUtils.getResourceName(ResourceType.LAYOUT.getName(), newFile.getName()); final XmlTag includeTag = elementFactory.createTagFromText(""); parentTag.addAfter(includeTag, to); parentTag.deleteChildRange(from, to); @@ -306,38 +289,4 @@ public class AndroidExtractAsIncludeAction extends AndroidBaseLayoutRefactoringA myLayoutFileName = layoutFileName; } } - - private static class MyInputValidatorEx implements InputValidatorEx { - private final PsiDirectory myDirectory; - - public MyInputValidatorEx(@NotNull PsiDirectory directory) { - myDirectory = directory; - } - - @Nullable - @Override - public String getErrorText(String inputString) { - if (inputString.length() == 0) { - return null; - } - final String fileName = addXmlExtensionIfNecessary(inputString); - try { - myDirectory.checkCreateFile(fileName); - } - catch (IncorrectOperationException e) { - return e.getMessage(); - } - return null; - } - - @Override - public boolean checkInput(String inputString) { - return inputString.length() > 0; - } - - @Override - public boolean canClose(String inputString) { - return checkInput(inputString) && getErrorText(inputString) == null; - } - } } diff --git a/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java b/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java index edb4b219d40a..e489e9101e1b 100644 --- a/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java +++ b/plugins/android/src/org/jetbrains/android/uipreview/DeviceConfiguratorPanel.java @@ -70,7 +70,7 @@ public abstract class DeviceConfiguratorPanel extends JPanel { }; @SuppressWarnings("unchecked") - public DeviceConfiguratorPanel(FolderConfiguration config) { + public DeviceConfiguratorPanel() { super(new BorderLayout()); createUIComponents(); @@ -148,18 +148,6 @@ public abstract class DeviceConfiguratorPanel extends JPanel { myQualifierOptionsPanel.add(editor.getComponent(), name); } - if (config != null) { - myChosenQualifiersConfig.set(config); - myAvailableQualifiersConfig.substract(config); - - for (ResourceQualifier qualifier : config.getQualifiers()) { - final MyQualifierEditor editor = myEditors.get(qualifier.getShortName()); - if (editor != null) { - editor.reset(qualifier); - } - } - } - myAvailableQualifiersList.setCellRenderer(new DefaultListCellRenderer() { @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { @@ -239,6 +227,18 @@ public abstract class DeviceConfiguratorPanel extends JPanel { }); } + public void init(@NotNull FolderConfiguration config) { + myChosenQualifiersConfig.set(config); + myAvailableQualifiersConfig.substract(config); + + for (ResourceQualifier qualifier : config.getQualifiers()) { + final MyQualifierEditor editor = myEditors.get(qualifier.getShortName()); + if (editor != null) { + editor.reset(qualifier); + } + } + } + protected void createDefaultConfig(FolderConfiguration config) { config.createDefault(); } diff --git a/plugins/android/src/org/jetbrains/android/uipreview/EditConfigurationDialog.java b/plugins/android/src/org/jetbrains/android/uipreview/EditConfigurationDialog.java index e64eb678ead1..002efdf767a6 100644 --- a/plugins/android/src/org/jetbrains/android/uipreview/EditConfigurationDialog.java +++ b/plugins/android/src/org/jetbrains/android/uipreview/EditConfigurationDialog.java @@ -50,7 +50,7 @@ public class EditConfigurationDialog extends DialogWrapper { myEditDeviceForm.reset(device); } - myDeviceConfiguratorPanel = new DeviceConfiguratorPanel(config) { + myDeviceConfiguratorPanel = new DeviceConfiguratorPanel() { @Override public void applyEditors() { try { @@ -84,6 +84,9 @@ public class EditConfigurationDialog extends DialogWrapper { config.setRegionQualifier(null); } }; + if (config != null) { + myDeviceConfiguratorPanel.init(config); + } myDeviceConfiguratorPanelWrapper.add(myDeviceConfiguratorPanel, BorderLayout.CENTER); myEditDeviceForm.getNameField().getDocument().addDocumentListener(myDeviceConfiguratorPanel.getUpdatingDocumentListener()); From 635edcac8a20fea633e9393f1d96cd899aa0f06a Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Fri, 17 Aug 2012 20:52:37 +0400 Subject: [PATCH 06/27] equals & hashCode --- .../android/uipreview/VirtualFileWrapper.java | 28 +++++++++++++++++ .../uipreview/VirtualFolderWrapper.java | 31 ++++++++++++++++++- 2 files changed, 58 insertions(+), 1 deletion(-) diff --git a/plugins/android/src/org/jetbrains/android/uipreview/VirtualFileWrapper.java b/plugins/android/src/org/jetbrains/android/uipreview/VirtualFileWrapper.java index 82cf8fe74e4a..ecaab2a46130 100644 --- a/plugins/android/src/org/jetbrains/android/uipreview/VirtualFileWrapper.java +++ b/plugins/android/src/org/jetbrains/android/uipreview/VirtualFileWrapper.java @@ -101,4 +101,32 @@ class VirtualFileWrapper implements IAbstractFile { public VirtualFile getFile() { return myFile; } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + VirtualFileWrapper wrapper = (VirtualFileWrapper)o; + + if (!myFile.equals(wrapper.myFile)) { + return false; + } + if (!myProject.equals(wrapper.myProject)) { + return false; + } + + return true; + } + + @Override + public int hashCode() { + int result = myProject.hashCode(); + result = 31 * result + myFile.hashCode(); + return result; + } } diff --git a/plugins/android/src/org/jetbrains/android/uipreview/VirtualFolderWrapper.java b/plugins/android/src/org/jetbrains/android/uipreview/VirtualFolderWrapper.java index 8af6d391ffa5..23259a17129c 100644 --- a/plugins/android/src/org/jetbrains/android/uipreview/VirtualFolderWrapper.java +++ b/plugins/android/src/org/jetbrains/android/uipreview/VirtualFolderWrapper.java @@ -6,6 +6,7 @@ import com.android.io.IAbstractResource; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -74,7 +75,7 @@ class VirtualFolderWrapper implements IAbstractFolder { result.add(name); } } - return result.toArray(new String[result.size()]); + return ArrayUtil.toStringArray(result); } @Override @@ -105,4 +106,32 @@ class VirtualFolderWrapper implements IAbstractFolder { public boolean delete() { throw new UnsupportedOperationException(); } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + + VirtualFolderWrapper wrapper = (VirtualFolderWrapper)o; + + if (!myFolder.equals(wrapper.myFolder)) { + return false; + } + if (!myProject.equals(wrapper.myProject)) { + return false; + } + + return true; + } + + @Override + public int hashCode() { + int result = myProject.hashCode(); + result = 31 * result + myFolder.hashCode(); + return result; + } } From b70bde1b5c63ece4a3300dd02d38b49a844f53e1 Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Tue, 21 Aug 2012 16:20:40 +0400 Subject: [PATCH 07/27] IDEA-80866 inline Android layout refactoring --- .../AndroidDesignerEditorPanel.java | 4 + .../messages/AndroidBundle.properties | 6 +- plugins/android/src/META-INF/plugin.xml | 9 +- .../AndroidResourceReferenceBase.java | 5 + .../AndroidInlineAllStyleUsagesProcessor.java | 107 +--------- .../AndroidInlineIncludeAction.java | 81 +++++++ .../AndroidInlineLayoutDialog.java | 63 ++++++ .../AndroidInlineLayoutHandler.java | 122 +++++++++++ .../AndroidInlineLayoutProcessor.java | 155 ++++++++++++++ .../AndroidInlineStyleHandler.java | 2 +- .../AndroidInlineStyleReferenceAction.java | 4 +- .../refactoring/AndroidInlineUtil.java | 148 ++++++++++++- .../AndroidRefactoringErrorException.java | 13 ++ .../android/refactoring/LayoutUsageData.java | 200 ++++++++++++++++++ .../testData/refactoring/inlineLayout/1.xml | 8 + .../testData/refactoring/inlineLayout/10.xml | 8 + .../refactoring/inlineLayout/10_after.xml | 13 ++ .../refactoring/inlineLayout/10_included.xml | 9 + .../testData/refactoring/inlineLayout/11.xml | 7 + .../refactoring/inlineLayout/11_after.xml | 12 ++ .../refactoring/inlineLayout/11_included.xml | 9 + .../testData/refactoring/inlineLayout/12.xml | 6 + .../refactoring/inlineLayout/12_after.xml | 11 + .../refactoring/inlineLayout/12_included.xml | 9 + .../testData/refactoring/inlineLayout/13.xml | 7 + .../refactoring/inlineLayout/13_after.xml | 12 ++ .../refactoring/inlineLayout/13_included.xml | 9 + .../testData/refactoring/inlineLayout/14.xml | 7 + .../refactoring/inlineLayout/14_after.xml | 12 ++ .../refactoring/inlineLayout/14_included.xml | 9 + .../testData/refactoring/inlineLayout/15.xml | 7 + .../refactoring/inlineLayout/15_included.xml | 5 + .../testData/refactoring/inlineLayout/16.xml | 7 + .../refactoring/inlineLayout/16_included.xml | 5 + .../testData/refactoring/inlineLayout/17.xml | 7 + .../refactoring/inlineLayout/17_after.xml | 11 + .../refactoring/inlineLayout/17_included.xml | 6 + .../testData/refactoring/inlineLayout/18.xml | 8 + .../refactoring/inlineLayout/18_after.xml | 16 ++ .../refactoring/inlineLayout/18_included.xml | 6 + .../testData/refactoring/inlineLayout/19.xml | 8 + .../refactoring/inlineLayout/19_included.xml | 6 + .../refactoring/inlineLayout/1_after.xml | 12 ++ .../refactoring/inlineLayout/1_included.xml | 6 + .../testData/refactoring/inlineLayout/2.xml | 8 + .../testData/refactoring/inlineLayout/20.xml | 7 + .../refactoring/inlineLayout/20_included.xml | 6 + .../refactoring/inlineLayout/2_after.xml | 11 + .../refactoring/inlineLayout/2_included.xml | 5 + .../testData/refactoring/inlineLayout/3.xml | 8 + .../refactoring/inlineLayout/3_after.xml | 12 ++ .../refactoring/inlineLayout/3_included.xml | 6 + .../testData/refactoring/inlineLayout/4.xml | 8 + .../refactoring/inlineLayout/4_after.xml | 14 ++ .../refactoring/inlineLayout/4_included.xml | 8 + .../testData/refactoring/inlineLayout/5.xml | 8 + .../refactoring/inlineLayout/5_after.xml | 13 ++ .../refactoring/inlineLayout/5_included.xml | 7 + .../testData/refactoring/inlineLayout/6.xml | 9 + .../refactoring/inlineLayout/6_after.xml | 14 ++ .../refactoring/inlineLayout/6_included.xml | 8 + .../testData/refactoring/inlineLayout/7.xml | 9 + .../refactoring/inlineLayout/7_after.xml | 13 ++ .../refactoring/inlineLayout/7_included.xml | 7 + .../testData/refactoring/inlineLayout/8.xml | 8 + .../refactoring/inlineLayout/8_after.xml | 16 ++ .../refactoring/inlineLayout/8_included.xml | 6 + .../testData/refactoring/inlineLayout/9.xml | 8 + .../refactoring/inlineLayout/9_after.xml | 16 ++ .../refactoring/inlineLayout/9_included.xml | 6 + .../refactoring/inlineLayout/MyActivity.java | 12 ++ .../refactoring/AndroidInlineLayoutTest.java | 192 +++++++++++++++++ 72 files changed, 1508 insertions(+), 114 deletions(-) create mode 100644 plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineIncludeAction.java create mode 100644 plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutDialog.java create mode 100644 plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutHandler.java create mode 100644 plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutProcessor.java create mode 100644 plugins/android/src/org/jetbrains/android/refactoring/AndroidRefactoringErrorException.java create mode 100644 plugins/android/src/org/jetbrains/android/refactoring/LayoutUsageData.java create mode 100644 plugins/android/testData/refactoring/inlineLayout/1.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/10.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/10_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/10_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/11.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/11_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/11_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/12.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/12_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/12_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/13.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/13_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/13_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/14.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/14_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/14_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/15.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/15_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/16.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/16_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/17.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/17_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/17_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/18.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/18_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/18_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/19.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/19_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/1_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/1_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/2.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/20.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/20_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/2_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/2_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/3.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/3_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/3_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/4.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/4_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/4_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/5.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/5_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/5_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/6.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/6_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/6_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/7.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/7_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/7_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/8.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/8_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/8_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/9.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/9_after.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/9_included.xml create mode 100644 plugins/android/testData/refactoring/inlineLayout/MyActivity.java create mode 100644 plugins/android/testSrc/org/jetbrains/android/refactoring/AndroidInlineLayoutTest.java diff --git a/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java b/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java index f9692f344727..a46ea84c3183 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java +++ b/plugins/android-designer/src/com/intellij/android/designer/designSurface/AndroidDesignerEditorPanel.java @@ -62,6 +62,7 @@ import org.jetbrains.android.facet.AndroidFacet; import org.jetbrains.android.maven.AndroidMavenUtil; import org.jetbrains.android.refactoring.AndroidExtractAsIncludeAction; import org.jetbrains.android.refactoring.AndroidExtractStyleAction; +import org.jetbrains.android.refactoring.AndroidInlineIncludeAction; import org.jetbrains.android.refactoring.AndroidInlineStyleReferenceAction; import org.jetbrains.android.sdk.AndroidPlatform; import org.jetbrains.android.sdk.AndroidSdkUtils; @@ -171,6 +172,9 @@ public final class AndroidDesignerEditorPanel extends DesignerEditorPanel { action = manager.getAction(AndroidExtractAsIncludeAction.ACTION_ID); group.add(new AndroidRefactoringActionWrapper("E_xtract Layout", action)); + + action = manager.getAction(AndroidInlineIncludeAction.ACTION_ID); + group.add(new AndroidRefactoringActionWrapper("I_nline Layout", action)); return group; } diff --git a/plugins/android/resources/messages/AndroidBundle.properties b/plugins/android/resources/messages/AndroidBundle.properties index 8b6f534025db..ec5dc1f84cd0 100644 --- a/plugins/android/resources/messages/AndroidBundle.properties +++ b/plugins/android/resources/messages/AndroidBundle.properties @@ -426,4 +426,8 @@ android.inline.style.title=Inline Android Style android.inline.style.command.name=Inline Style ''{0}'' android.inline.style.inline.all.text=Inline &all references and remove the style android.inline.style.inline.this.text=Inline &this usage and keep the style -android.extract.as.include.title=Extract Android Layout \ No newline at end of file +android.extract.as.include.title=Extract Android Layout +android.inline.layout.command.name=Inline Layout File ''{0}'' +android.inline.file.inline.all.text=Inline &all references and remove the file +android.inline.file.inline.this.text=Inline &this usage and keep the file +android.inline.layout.title=Inline Android Layout \ No newline at end of file diff --git a/plugins/android/src/META-INF/plugin.xml b/plugins/android/src/META-INF/plugin.xml index 64b3c6a4c6af..5c04e274c760 100644 --- a/plugins/android/src/META-INF/plugin.xml +++ b/plugins/android/src/META-INF/plugin.xml @@ -94,6 +94,10 @@ text="Inline _Style..." description="Inlines Android style"> + + + JUnit @@ -247,7 +251,8 @@ - + + @@ -255,4 +260,4 @@ - + \ No newline at end of file diff --git a/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReferenceBase.java b/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReferenceBase.java index 309647f84615..c433d26cc501 100644 --- a/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReferenceBase.java +++ b/plugins/android/src/org/jetbrains/android/dom/converters/AndroidResourceReferenceBase.java @@ -45,6 +45,11 @@ public class AndroidResourceReferenceBase extends PsiReferenceBase.Poly usages = new HashSet(); - addReferences(myStyleElement, usages); + AndroidInlineUtil.addReferences(myStyleElement, usages); for (PsiField field : AndroidResourceUtil.findResourceFieldsForValueResource(myStyleTag, false)) { - addReferences(field, usages); + AndroidInlineUtil.addReferences(field, usages); } return usages.toArray(new UsageInfo[usages.size()]); } - private static void addReferences(@NotNull PsiElement element, @NotNull Collection result) { - for (PsiReference reference : ReferencesSearch.search(element)) { - result.add(new UsageInfo(reference.getElement())); - } - } - @Override protected void performRefactoring(UsageInfo[] usages) { @@ -112,7 +98,7 @@ class AndroidInlineAllStyleUsagesProcessor extends BaseRefactoringProcessor { continue; } final XmlTag tag = PsiTreeUtil.getParentOfType(element, XmlTag.class); - StyleUsageData usageData = tag != null ? AndroidInlineUtil.getUsageData(tag) : null; + StyleUsageData usageData = tag != null ? AndroidInlineUtil.getStyleUsageData(tag) : null; if (usageData == null) { if (usage.getReference() instanceof ResourceNameConverter.MyParentStyleReference) { @@ -135,7 +121,8 @@ class AndroidInlineAllStyleUsagesProcessor extends BaseRefactoringProcessor { unambiguousUsages.size() > 0 || unsupportedUsages.size() > 0 || implicitlyInherited.size() > 0) { - final String errorMessage = buildErrorMessage(myProject, nonXmlUsages, unambiguousUsages, unsupportedUsages, implicitlyInherited); + final String errorMessage = AndroidInlineUtil + .buildErrorMessage(myProject, nonXmlUsages, unambiguousUsages, unsupportedUsages, implicitlyInherited); AndroidUtils.reportError(myProject, errorMessage, AndroidBundle.message("android.inline.style.title")); return; } @@ -156,88 +143,4 @@ class AndroidInlineAllStyleUsagesProcessor extends BaseRefactoringProcessor { // do it because the refactoring can be invoked from UI designer return UndoConfirmationPolicy.REQUEST_CONFIRMATION; } - - @NotNull - private static String buildErrorMessage(Project project, - Collection nonXmlUsages, - Collection unambiguousUsages, - Collection unsupportedUsages, - Collection implicitlyInherited) { - final StringBuilder builder = new StringBuilder("Cannot perform refactoring\n\n"); - - if (nonXmlUsages.size() > 0) { - builder.append("Non-XML references are not supported:\n"); - buildString(builder, project, nonXmlUsages); - builder.append("\n\n"); - } - - if (unambiguousUsages.size() > 0) { - builder.append("Unambiguous references:\n"); - buildString(builder, project, unambiguousUsages); - builder.append("\n\n"); - } - - if (unsupportedUsages.size() > 0) { - builder.append("Unsupported references:\n"); - buildString(builder, project, unsupportedUsages); - builder.append("\n\n"); - } - - if (implicitlyInherited.size() > 0) { - builder.append("Implicit inheritance is not supported:\n"); - buildString(builder, project, implicitlyInherited); - builder.append("\n\n"); - } - builder.delete(builder.length() - 2, builder.length()); - return builder.toString(); - } - - private static void buildString(StringBuilder builder, Project project, Collection invalidRefs) { - final OrderedSet lines = new OrderedSet(); - - for (PsiElement usage : invalidRefs) { - final PsiFile psiFile = usage.getContainingFile(); - final VirtualFile file = psiFile != null - ? psiFile.getVirtualFile() - : null; - if (file != null) { - lines.add(" in '" + getPresentableFilePath(project, file) + "'"); - } - else { - lines.add(" in unknown file"); - } - } - - for (Iterator it = lines.iterator(); it.hasNext(); ) { - final String line = it.next(); - builder.append(line); - - if (it.hasNext()) { - builder.append('\n'); - } - } - } - - private static String getPresentableFilePath(Project project, VirtualFile file) { - final ProjectRootManager projectRootManager = ProjectRootManager.getInstance(project); - final int contentRootCount = projectRootManager.getContentRoots().length; - - if (contentRootCount == 0) { - return file.getPath(); - } - final VirtualFile contentRoot = projectRootManager.getFileIndex().getContentRootForFile(file); - - if (contentRoot == null) { - return file.getPath(); - } - final String relativePath = VfsUtilCore.getRelativePath(file, contentRoot, '/'); - - if (relativePath == null) { - return file.getPath(); - } - final String presentableRelativePath = contentRootCount == 1 - ? relativePath - : contentRoot.getName() + '/' + relativePath; - return FileUtil.toSystemDependentName(".../" + presentableRelativePath); - } } diff --git a/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineIncludeAction.java b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineIncludeAction.java new file mode 100644 index 000000000000..96ecdd07588c --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineIncludeAction.java @@ -0,0 +1,81 @@ +package org.jetbrains.android.refactoring; + +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiFile; +import com.intellij.psi.xml.XmlFile; +import com.intellij.psi.xml.XmlTag; +import com.intellij.refactoring.RefactoringBundle; +import com.intellij.util.xml.DomManager; +import org.jetbrains.android.dom.converters.AndroidResourceReferenceBase; +import org.jetbrains.android.dom.layout.LayoutDomFileDescription; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.android.util.AndroidUtils; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.TestOnly; + +/** + * @author Eugene.Kudelevsky + */ +public class AndroidInlineIncludeAction extends AndroidBaseXmlRefactoringAction { + private final AndroidInlineTestConfig myTestConfig; + + public static final String ACTION_ID = "AndroidInlineIncludeAction"; + + @SuppressWarnings("UnusedDeclaration") + public AndroidInlineIncludeAction() { + myTestConfig = null; + } + + @TestOnly + public AndroidInlineIncludeAction(AndroidInlineTestConfig testConfig) { + myTestConfig = testConfig; + } + + @Override + protected void doRefactorForTags(@NotNull Project project, @NotNull final XmlTag[] tags) { + assert tags.length == 1; + final XmlTag tag = tags[0]; + + final PsiFile file = tag.getContainingFile(); + if (file == null) { + return; + } + final LayoutUsageData usageData = AndroidInlineUtil.getLayoutUsageData(tag); + + if (usageData == null) { + return; + } + final AndroidResourceReferenceBase reference = usageData.getReference(); + final String title = AndroidBundle.message("android.inline.layout.title"); + final PsiElement[] resolvedElements = reference.computeTargetElements(); + + if (resolvedElements.length == 0) { + AndroidUtils.reportError(project, "Cannot find layout by reference '" + reference.getValue() + "'", title); + return; + } + + if (resolvedElements.length > 1) { + AndroidUtils.reportError(project, RefactoringBundle.getCannotRefactorMessage("Unambiguous layout reference."), title); + return; + } + final PsiElement resolvedElement = resolvedElements[0]; + + if (!(resolvedElement instanceof XmlFile)) { + AndroidUtils.reportError(project, "Cannot find layout by reference '" + reference.getValue() + "'", title); + return; + } + AndroidInlineUtil.doInlineLayoutFile(project, (XmlFile)resolvedElement, usageData.getReference().getElement(), myTestConfig); + } + + @Override + protected boolean isEnabledForTags(@NotNull XmlTag[] tags) { + return tags.length == 1 && AndroidInlineUtil.getLayoutUsageData(tags[0]) != null; + } + + @Override + protected boolean isMyFile(PsiFile file) { + return DomManager.getDomManager(file.getProject()). + getDomFileDescription((XmlFile)file) instanceof LayoutDomFileDescription; + } +} diff --git a/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutDialog.java b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutDialog.java new file mode 100644 index 000000000000..543fdc233a9e --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutDialog.java @@ -0,0 +1,63 @@ +package org.jetbrains.android.refactoring; + +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiElement; +import com.intellij.psi.xml.XmlFile; +import com.intellij.psi.xml.XmlTag; +import com.intellij.refactoring.inline.InlineOptionsDialog; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +/** + * @author Eugene.Kudelevsky + */ +public class AndroidInlineLayoutDialog extends InlineOptionsDialog { + private final XmlFile myLayoutFile; + private final XmlTag myLayoutRootTag; + private final PsiElement myUsageElement; + + public AndroidInlineLayoutDialog(@NotNull Project project, + @NotNull XmlFile layoutFile, + @NotNull XmlTag layoutRootTag, + @Nullable PsiElement usageElement) { + super(project, true, layoutFile); + myLayoutFile = layoutFile; + myLayoutRootTag = layoutRootTag; + myUsageElement = usageElement; + myInvokedOnReference = usageElement != null; + setTitle(AndroidBundle.message("android.inline.layout.title")); + init(); + } + + @Override + protected String getNameLabelText() { + return "Layout file '" + myLayoutFile.getName() + "'"; + } + + @Override + protected String getBorderTitle() { + return "Inline"; + } + + @Override + protected String getInlineAllText() { + return AndroidBundle.message("android.inline.file.inline.all.text"); + } + + @Override + protected String getInlineThisText() { + return AndroidBundle.message("android.inline.file.inline.this.text"); + } + + @Override + protected boolean isInlineThis() { + return myUsageElement != null; + } + + @Override + protected void doAction() { + final PsiElement usageElement = isInlineThisOnly() ? myUsageElement : null; + invokeRefactoring(new AndroidInlineLayoutProcessor(myProject, myLayoutFile, myLayoutRootTag, usageElement)); + } +} diff --git a/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutHandler.java b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutHandler.java new file mode 100644 index 000000000000..ba13e20f52cf --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutHandler.java @@ -0,0 +1,122 @@ +package org.jetbrains.android.refactoring; + +import com.intellij.codeInsight.TargetElementUtilBase; +import com.intellij.lang.Language; +import com.intellij.lang.refactoring.InlineActionHandler; +import com.intellij.lang.xml.XMLLanguage; +import com.intellij.openapi.editor.Editor; +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiReference; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.*; +import com.intellij.util.xml.DomManager; +import org.jetbrains.android.dom.converters.AndroidResourceReferenceBase; +import org.jetbrains.android.dom.layout.LayoutDomFileDescription; +import org.jetbrains.android.dom.wrappers.ResourceElementWrapper; +import org.jetbrains.android.facet.AndroidFacet; +import org.jetbrains.android.util.AndroidBundle; +import org.jetbrains.android.util.ErrorReporter; +import org.jetbrains.android.util.HintBasedErrorReporter; +import org.jetbrains.android.util.ProjectBasedErrorReporter; +import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.TestOnly; + +/** + * @author Eugene.Kudelevsky + */ +public class AndroidInlineLayoutHandler extends InlineActionHandler { + private static AndroidInlineTestConfig ourTestConfig; + + @TestOnly + public static void setTestConfig(@Nullable AndroidInlineTestConfig testConfig) { + ourTestConfig = testConfig; + } + + @Override + public boolean isEnabledForLanguage(Language l) { + return l == XMLLanguage.INSTANCE; + } + + @Override + public boolean canInlineElement(PsiElement element) { + if (element instanceof ResourceElementWrapper) { + element = ((ResourceElementWrapper)element).getWrappee(); + } + if (!(element instanceof XmlElement)) { + return false; + } + if (AndroidFacet.getInstance(element) == null) { + return false; + } + if (element instanceof XmlFile) { + if (((XmlFile)element).getRootTag() == null) { + return false; + } + return DomManager.getDomManager(element.getProject()).getDomFileDescription((XmlFile)element) + instanceof LayoutDomFileDescription; + } + else if (element instanceof XmlToken && ((XmlToken)element).getTokenType() == XmlTokenType.XML_NAME) { + return getLayoutUsageDataFromContext(element) != null; + } + return false; + } + + @Nullable + private static LayoutUsageData getLayoutUsageDataFromContext(PsiElement context) { + final XmlTag tag = PsiTreeUtil.getParentOfType(context, XmlTag.class); + return tag != null + ? AndroidInlineUtil.getLayoutUsageData(tag) + : null; + } + + @Override + public void inlineElement(Project project, Editor editor, PsiElement element) { + if (element instanceof ResourceElementWrapper) { + element = ((ResourceElementWrapper)element).getWrappee(); + } + + if (element instanceof XmlFile) { + PsiElement usageElement = null; + + if (editor != null) { + final PsiReference reference = TargetElementUtilBase.findReference(editor); + + if (reference != null) { + usageElement = reference.getElement(); + } + } + AndroidInlineUtil.doInlineLayoutFile(project, (XmlFile)element, usageElement, ourTestConfig); + return; + } + final LayoutUsageData usageData = getLayoutUsageDataFromContext(element); + assert usageData != null; + final AndroidResourceReferenceBase ref = usageData.getReference(); + final PsiElement[] elements = ref.computeTargetElements(); + final ErrorReporter errorReporter = editor != null + ? new HintBasedErrorReporter(editor) + : new ProjectBasedErrorReporter(project); + final String title = AndroidBundle.message("android.inline.layout.title"); + + if (elements.length == 0) { + final String resName = ref.getResourceValue().getResourceName(); + final String message = resName != null + ? "Cannot find layout '" + resName + "'" + : "Error: cannot find the layout"; + errorReporter.report(message, title); + return; + } + + if (elements.length > 1) { + errorReporter.report("Error: unambiguous reference", title); + return; + } + + final PsiElement resolvedElement = elements[0]; + if (!(resolvedElement instanceof XmlFile)) { + errorReporter.report("Cannot inline reference '" + ref.getValue() + "'", title); + return; + } + AndroidInlineUtil.doInlineLayoutFile(project, (XmlFile)resolvedElement, usageData.getIncludeTag(), ourTestConfig); + } +} diff --git a/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutProcessor.java b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutProcessor.java new file mode 100644 index 000000000000..582fc9b6ca45 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineLayoutProcessor.java @@ -0,0 +1,155 @@ +package org.jetbrains.android.refactoring; + +import com.intellij.lang.xml.XMLLanguage; +import com.intellij.openapi.command.UndoConfirmationPolicy; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiField; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.xml.XmlFile; +import com.intellij.psi.xml.XmlTag; +import com.intellij.refactoring.BaseRefactoringProcessor; +import com.intellij.refactoring.ui.UsageViewDescriptorAdapter; +import com.intellij.usageView.UsageInfo; +import com.intellij.usageView.UsageViewBundle; +import com.intellij.usageView.UsageViewDescriptor; +import com.intellij.util.containers.HashSet; +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.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Set; + +/** + * @author Eugene.Kudelevsky + */ +public class AndroidInlineLayoutProcessor extends BaseRefactoringProcessor { + private static final Logger LOG = Logger.getInstance("#org.jetbrains.android.refactoring.AndroidInlineLayoutProcessor"); + + private final XmlFile myLayoutFile; + private final XmlTag myLayoutRootTag; + private final PsiElement myUsageElement; + + protected AndroidInlineLayoutProcessor(@NotNull Project project, + @NotNull XmlFile file, + @NotNull XmlTag rootTag, + @Nullable PsiElement usageElement) { + super(project); + myLayoutFile = file; + myLayoutRootTag = rootTag; + myUsageElement = usageElement; + } + + @NotNull + @Override + protected UsageViewDescriptor createUsageViewDescriptor(UsageInfo[] usages) { + return new UsageViewDescriptorAdapter() { + @NotNull + @Override + public PsiElement[] getElements() { + return new PsiElement[]{myLayoutFile}; + } + + @Override + public String getCodeReferencesText(int usagesCount, int filesCount) { + return "References to be inlined" + UsageViewBundle.getReferencesString(usagesCount, filesCount); + } + + @Override + public String getProcessedElementsHeader() { + return "Layout file to inline"; + } + }; + } + + @NotNull + @Override + protected UsageInfo[] findUsages() { + if (myUsageElement != null) { + return new UsageInfo[] {new UsageInfo(myUsageElement)}; + } + final Set usages = new HashSet(); + AndroidInlineUtil.addReferences(myLayoutFile, usages); + + for (PsiField field : AndroidResourceUtil.findResourceFieldsForFileResource(myLayoutFile, false)) { + AndroidInlineUtil.addReferences(field, usages); + } + return usages.toArray(new UsageInfo[usages.size()]); + } + + @Override + protected void performRefactoring(UsageInfo[] usages) { + final List inlineInfos = new ArrayList(); + final List nonXmlUsages = new ArrayList(); + final List unsupportedUsages = new ArrayList(); + final List unambiguousUsages = new ArrayList(); + + for (UsageInfo usage : usages) { + final PsiElement element = usage.getElement(); + if (element == null) continue; + + if (element.getLanguage() != XMLLanguage.INSTANCE) { + nonXmlUsages.add(element); + continue; + } + final XmlTag tag = PsiTreeUtil.getParentOfType(element, XmlTag.class); + final LayoutUsageData usageData = tag != null + ? AndroidInlineUtil.getLayoutUsageData(tag) + : null; + if (usageData == null) { + unsupportedUsages.add(element); + continue; + } + + if (usageData.getReference().computeTargetElements().length > 1) { + unambiguousUsages.add(element); + continue; + } + inlineInfos.add(usageData); + } + + if (nonXmlUsages.size() > 0 || unambiguousUsages.size() > 0 || unsupportedUsages.size() > 0) { + final String errorMessage = AndroidInlineUtil.buildErrorMessage( + myProject, nonXmlUsages, unambiguousUsages, unsupportedUsages, + Collections.emptyList()); + AndroidUtils.reportError(myProject, errorMessage, AndroidBundle.message("android.inline.style.title")); + return; + } + + for (LayoutUsageData info : inlineInfos) { + try { + info.inline(myLayoutRootTag); + } + catch (AndroidRefactoringErrorException e) { + LOG.info(e); + String message = e.getMessage(); + + if (message == null) { + message = "Refactoring was performed with errors"; + } + AndroidUtils.reportError(myProject, message, AndroidBundle.message("android.inline.style.title")); + return; + } + } + if (myUsageElement == null) { + myLayoutFile.delete(); + } + } + + @Override + protected String getCommandName() { + return AndroidBundle.message("android.inline.layout.command.name", myLayoutFile.getName()); + } + + @Override + protected UndoConfirmationPolicy getUndoConfirmationPolicy() { + // do it because the refactoring can be invoked from UI designer + return UndoConfirmationPolicy.REQUEST_CONFIRMATION; + } +} diff --git a/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineStyleHandler.java b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineStyleHandler.java index 198d9afa087a..866e65c6c37b 100644 --- a/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineStyleHandler.java +++ b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineStyleHandler.java @@ -76,6 +76,6 @@ public class AndroidInlineStyleHandler extends InlineActionHandler { return null; } final XmlTag tag = PsiTreeUtil.getParentOfType(usageElement, XmlTag.class, false); - return tag != null ? AndroidInlineUtil.getUsageData(tag) : null; + return tag != null ? AndroidInlineUtil.getStyleUsageData(tag) : null; } } diff --git a/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineStyleReferenceAction.java b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineStyleReferenceAction.java index 5a69d1965029..363e8322ffc7 100644 --- a/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineStyleReferenceAction.java +++ b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineStyleReferenceAction.java @@ -47,7 +47,7 @@ public class AndroidInlineStyleReferenceAction extends AndroidBaseXmlRefactoring if (file == null) { return; } - final StyleUsageData usageData = AndroidInlineUtil.getUsageData(tag); + final StyleUsageData usageData = AndroidInlineUtil.getStyleUsageData(tag); if (usageData == null) { return; @@ -87,7 +87,7 @@ public class AndroidInlineStyleReferenceAction extends AndroidBaseXmlRefactoring @Override protected boolean isEnabledForTags(@NotNull XmlTag[] tags) { - return tags.length == 1 && AndroidInlineUtil.getUsageData(tags[0]) != null; + return tags.length == 1 && AndroidInlineUtil.getStyleUsageData(tags[0]) != null; } @Override diff --git a/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineUtil.java b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineUtil.java index 3c94d0cb27e2..9d43e8588a2c 100644 --- a/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineUtil.java +++ b/plugins/android/src/org/jetbrains/android/refactoring/AndroidInlineUtil.java @@ -5,18 +5,27 @@ import com.intellij.openapi.application.Result; import com.intellij.openapi.command.UndoConfirmationPolicy; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ProjectRootManager; +import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.vfs.VfsUtilCore; +import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiReference; +import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlAttributeValue; +import com.intellij.psi.xml.XmlFile; import com.intellij.psi.xml.XmlTag; import com.intellij.refactoring.RefactoringBundle; +import com.intellij.usageView.UsageInfo; import com.intellij.util.containers.HashMap; +import com.intellij.util.containers.OrderedSet; import com.intellij.util.xml.DomElement; import com.intellij.util.xml.DomManager; import com.intellij.util.xml.GenericAttributeValue; import org.jetbrains.android.dom.converters.AndroidResourceReferenceBase; +import org.jetbrains.android.dom.layout.Include; import org.jetbrains.android.dom.layout.LayoutViewElement; import org.jetbrains.android.dom.resources.ResourceValue; import org.jetbrains.android.dom.resources.Style; @@ -28,6 +37,8 @@ import org.jetbrains.android.util.ErrorReporter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Collection; +import java.util.Iterator; import java.util.Map; /** @@ -59,7 +70,7 @@ class AndroidInlineUtil { } @Nullable - static StyleUsageData getUsageData(@NotNull XmlTag tag) { + static StyleUsageData getStyleUsageData(@NotNull XmlTag tag) { final DomElement domElement = DomManager.getDomManager(tag.getProject()).getDomElement(tag); if (domElement instanceof LayoutViewElement) { @@ -80,23 +91,39 @@ class AndroidInlineUtil { return null; } + @Nullable + static LayoutUsageData getLayoutUsageData(@NotNull XmlTag tag) { + final Project project = tag.getProject(); + final DomElement domElement = DomManager.getDomManager(project).getDomElement(tag); + + if (domElement instanceof Include) { + final GenericAttributeValue layoutAttribute = ((Include)domElement).getLayout(); + final AndroidResourceReferenceBase reference = getAndroidResourceReference(layoutAttribute); + + if (reference != null) { + return new LayoutUsageData(project, tag, reference); + } + } + return null; + } + @Nullable private static AndroidResourceReferenceBase getAndroidResourceReference(@Nullable GenericAttributeValue attribute) { if (attribute == null) { return null; } - final ResourceValue styleValue = attribute.getValue(); - if (styleValue == null || styleValue.getPackage() != null) { + final ResourceValue resValue = attribute.getValue(); + if (resValue == null || resValue.getPackage() != null) { return null; } - final XmlAttributeValue styleAttributeValue = attribute.getXmlAttributeValue(); - if (styleAttributeValue == null) { + final XmlAttributeValue value = attribute.getXmlAttributeValue(); + if (value == null) { return null; } - for (PsiReference reference : styleAttributeValue.getReferences()) { + for (PsiReference reference : value.getReferences()) { if (reference instanceof AndroidResourceReferenceBase) { return (AndroidResourceReferenceBase)reference; } @@ -237,6 +264,115 @@ class AndroidInlineUtil { ? data : null; } + static void addReferences(@NotNull PsiElement element, @NotNull Collection result) { + for (PsiReference reference : ReferencesSearch.search(element)) { + result.add(new UsageInfo(reference.getElement())); + } + } + + @NotNull + static String buildErrorMessage(Project project, + Collection nonXmlUsages, + Collection unambiguousUsages, + Collection unsupportedUsages, + Collection implicitlyInherited) { + final StringBuilder builder = new StringBuilder("Cannot perform refactoring\n\n"); + + if (nonXmlUsages.size() > 0) { + builder.append("Non-XML references are not supported:\n"); + buildString(builder, project, nonXmlUsages); + builder.append("\n\n"); + } + + if (unambiguousUsages.size() > 0) { + builder.append("Unambiguous references:\n"); + buildString(builder, project, unambiguousUsages); + builder.append("\n\n"); + } + + if (unsupportedUsages.size() > 0) { + builder.append("Unsupported references:\n"); + buildString(builder, project, unsupportedUsages); + builder.append("\n\n"); + } + + if (implicitlyInherited.size() > 0) { + builder.append("Implicit inheritance is not supported:\n"); + buildString(builder, project, implicitlyInherited); + builder.append("\n\n"); + } + builder.delete(builder.length() - 2, builder.length()); + return builder.toString(); + } + + private static void buildString(StringBuilder builder, Project project, Collection invalidRefs) { + final OrderedSet lines = new OrderedSet(); + + for (PsiElement usage : invalidRefs) { + final PsiFile psiFile = usage.getContainingFile(); + final VirtualFile file = psiFile != null + ? psiFile.getVirtualFile() + : null; + if (file != null) { + lines.add(" in '" + getPresentableFilePath(project, file) + "'"); + } + else { + lines.add(" in unknown file"); + } + } + + for (Iterator it = lines.iterator(); it.hasNext(); ) { + final String line = it.next(); + builder.append(line); + + if (it.hasNext()) { + builder.append('\n'); + } + } + } + + private static String getPresentableFilePath(Project project, VirtualFile file) { + final ProjectRootManager projectRootManager = ProjectRootManager.getInstance(project); + final int contentRootCount = projectRootManager.getContentRoots().length; + + if (contentRootCount == 0) { + return file.getPath(); + } + final VirtualFile contentRoot = projectRootManager.getFileIndex().getContentRootForFile(file); + + if (contentRoot == null) { + return file.getPath(); + } + final String relativePath = VfsUtilCore.getRelativePath(file, contentRoot, '/'); + + if (relativePath == null) { + return file.getPath(); + } + final String presentableRelativePath = contentRootCount == 1 + ? relativePath + : contentRoot.getName() + '/' + relativePath; + return FileUtil.toSystemDependentName(".../" + presentableRelativePath); + } + + static void doInlineLayoutFile(@NotNull Project project, + @NotNull XmlFile layoutFile, + @Nullable PsiElement usageElement, + @Nullable AndroidInlineTestConfig testConfig) { + final XmlTag rootTag = layoutFile.getRootTag(); + assert rootTag != null; + + if (testConfig == null) { + final AndroidInlineLayoutDialog dialog = new AndroidInlineLayoutDialog(project, layoutFile, rootTag, usageElement); + dialog.show(); + } + else { + final AndroidInlineLayoutProcessor processor = + new AndroidInlineLayoutProcessor(project, layoutFile, rootTag, testConfig.isInlineThisOnly() ? usageElement : null); + processor.setPreviewUsages(false); + processor.run(); + } + } + static class MyStyleData { private final String myStyleName; private final Style myStyleElement; diff --git a/plugins/android/src/org/jetbrains/android/refactoring/AndroidRefactoringErrorException.java b/plugins/android/src/org/jetbrains/android/refactoring/AndroidRefactoringErrorException.java new file mode 100644 index 000000000000..1cb5f4cb9e99 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/refactoring/AndroidRefactoringErrorException.java @@ -0,0 +1,13 @@ +package org.jetbrains.android.refactoring; + +/** + * @author Eugene.Kudelevsky + */ +public class AndroidRefactoringErrorException extends Exception { + public AndroidRefactoringErrorException() { + } + + public AndroidRefactoringErrorException(String message) { + super(message); + } +} diff --git a/plugins/android/src/org/jetbrains/android/refactoring/LayoutUsageData.java b/plugins/android/src/org/jetbrains/android/refactoring/LayoutUsageData.java new file mode 100644 index 000000000000..520fd62a1d24 --- /dev/null +++ b/plugins/android/src/org/jetbrains/android/refactoring/LayoutUsageData.java @@ -0,0 +1,200 @@ +package org.jetbrains.android.refactoring; + +import com.android.sdklib.SdkConstants; +import com.intellij.lang.ASTNode; +import com.intellij.openapi.editor.Document; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.TextRange; +import com.intellij.psi.PsiDocumentManager; +import com.intellij.psi.PsiFile; +import com.intellij.psi.XmlElementFactory; +import com.intellij.psi.codeStyle.CodeStyleManager; +import com.intellij.psi.xml.XmlAttribute; +import com.intellij.psi.xml.XmlChildRole; +import com.intellij.psi.xml.XmlTag; +import com.intellij.util.containers.HashMap; +import org.jetbrains.android.dom.converters.AndroidResourceReferenceBase; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @author Eugene.Kudelevsky + */ +public class LayoutUsageData { + private final Project myProject; + private final XmlTag myIncludeTag; + private final AndroidResourceReferenceBase myReference; + + public LayoutUsageData(@NotNull Project project, + @NotNull XmlTag includeTag, + @NotNull AndroidResourceReferenceBase reference) { + myProject = project; + myIncludeTag = includeTag; + myReference = reference; + } + + @NotNull + public AndroidResourceReferenceBase getReference() { + return myReference; + } + + public void inline(@NotNull XmlTag layoutRootTag) throws AndroidRefactoringErrorException { + final XmlTag parent = myIncludeTag.getParentTag(); + + if ("merge".equals(layoutRootTag.getName()) && parent != null) { + inlineMultiTags(myIncludeTag, parent, layoutRootTag, myProject); + } + else { + inlineSingleTag(myIncludeTag, parent, layoutRootTag); + } + } + + @NotNull + public XmlTag getIncludeTag() { + return myIncludeTag; + } + + private static void inlineSingleTag(XmlTag includeTag, XmlTag includeParentTag, XmlTag layoutRootTag) { + final Map attributesToAdd = new HashMap(); + + for (XmlAttribute attribute : includeTag.getAttributes()) { + final String namespace = attribute.getNamespace(); + + if (SdkConstants.NS_RESOURCES.equals(namespace)) { + attributesToAdd.put(attribute.getLocalName(), attribute.getValue()); + } + } + final XmlTag newTag = (XmlTag)includeTag.replace(layoutRootTag.copy()); + final List toDelete = new ArrayList(); + + for (XmlAttribute attribute : newTag.getAttributes()) { + if (attribute.isNamespaceDeclaration()) { + final String localName = attribute.getLocalName(); + final String prefix = localName.equals(attribute.getName()) ? "" : localName; + final String namespace = attribute.getValue(); + + if (includeParentTag != null && namespace.equals(includeParentTag.getNamespaceByPrefix(prefix))) { + toDelete.add(attribute); + } + } + } + + for (XmlAttribute attribute : toDelete) { + attribute.delete(); + } + + for (Map.Entry entry : attributesToAdd.entrySet()) { + final String localName = entry.getKey(); + final String value = entry.getValue(); + newTag.setAttribute(localName, SdkConstants.NS_RESOURCES, value); + } + CodeStyleManager.getInstance(newTag.getManager()).reformat(newTag); + } + + private static void inlineMultiTags(XmlTag includeTag, XmlTag includeTagParent, XmlTag mergeTag, Project project) + throws AndroidRefactoringErrorException { + final Map namespacesFromParent = includeTagParent.getLocalNamespaceDeclarations(); + final Map namespacesToAddToParent = new HashMap(); + final Map namespacesToAddToEachTag = new HashMap(); + + for (Map.Entry entry : mergeTag.getLocalNamespaceDeclarations().entrySet()) { + final String prefix = entry.getKey(); + final String namespace = entry.getValue(); + final String declaredNamespace = namespacesFromParent.get(prefix); + + if (declaredNamespace != null && !declaredNamespace.equals(namespace)) { + namespacesToAddToEachTag.put(prefix, namespace); + } + else { + namespacesToAddToParent.put(prefix, namespace); + } + } + final XmlTag mergeTagCopy = (XmlTag)mergeTag.copy(); + final XmlElementFactory xmlElementFactory = XmlElementFactory.getInstance(project); + + for (XmlTag subtag : mergeTagCopy.getSubTags()) { + final XmlAttribute[] attributes = subtag.getAttributes(); + final XmlAttribute firstAttribute = attributes.length > 0 ? attributes[0] : null; + + for (Map.Entry entry : namespacesToAddToEachTag.entrySet()) { + final String prefix = entry.getKey(); + final String namespace = entry.getValue(); + + if (!subtag.getLocalNamespaceDeclarations().containsKey(prefix)) { + final XmlAttribute xmlnsAttr = xmlElementFactory.createXmlAttribute("xmlns:" + prefix, namespace); + + if (firstAttribute != null) { + subtag.addBefore(xmlnsAttr, firstAttribute); + } + else { + subtag.add(xmlnsAttr); + } + } + } + } + replaceByTagContent(project, includeTag, mergeTagCopy); + addNamespaceAttributes(includeTagParent, namespacesToAddToParent, project); + } + + private static void addNamespaceAttributes(XmlTag tag, Map namespaces, Project project) { + final XmlAttribute[] parentAttributes = tag.getAttributes(); + final XmlAttribute firstParentAttribute = parentAttributes.length > 0 ? parentAttributes[0] : null; + final XmlElementFactory factory = XmlElementFactory.getInstance(project); + + for (Map.Entry entry : namespaces.entrySet()) { + final String prefix = entry.getKey(); + final String namespace = entry.getValue(); + + if (!namespace.equals(tag.getNamespaceByPrefix(prefix))) { + final XmlAttribute xmlnsAttr = factory.createXmlAttribute("xmlns:" + prefix, namespace); + + if (firstParentAttribute != null) { + tag.addBefore(xmlnsAttr, firstParentAttribute); + } + else { + tag.add(xmlnsAttr); + } + } + } + } + + private static void replaceByTagContent(Project project, XmlTag tagToReplace, XmlTag tagToInline) + throws AndroidRefactoringErrorException { + final ASTNode node = tagToInline.getNode(); + + if (node == null) { + throw new AndroidRefactoringErrorException(); + } + final ASTNode startTagEnd = XmlChildRole.START_TAG_END_FINDER.findChild(node); + final ASTNode closingTagStart = XmlChildRole.CLOSING_TAG_START_FINDER.findChild(node); + + if (startTagEnd == null || closingTagStart == null) { + throw new AndroidRefactoringErrorException(); + } + final int contentStart = startTagEnd.getTextRange().getEndOffset(); + final int contentEnd = closingTagStart.getTextRange().getStartOffset(); + + if (contentStart < 0 || contentEnd < 0 || contentStart >= contentEnd) { + throw new AndroidRefactoringErrorException(); + } + final PsiFile file = tagToInline.getContainingFile(); + + if(file == null) { + throw new AndroidRefactoringErrorException(); + } + final String textToInline = file.getText(). + substring(contentStart, contentEnd).trim(); + final PsiDocumentManager documentManager = PsiDocumentManager.getInstance(project); + final Document document = documentManager.getDocument(tagToReplace.getContainingFile()); + + if (document == null) { + throw new AndroidRefactoringErrorException(); + } + final TextRange range = tagToReplace.getTextRange(); + document.replaceString(range.getStartOffset(), range.getEndOffset(), textToInline); + documentManager.commitDocument(document); + } +} diff --git a/plugins/android/testData/refactoring/inlineLayout/1.xml b/plugins/android/testData/refactoring/inlineLayout/1.xml new file mode 100644 index 000000000000..432fb78b96cc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/1.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/10.xml b/plugins/android/testData/refactoring/inlineLayout/10.xml new file mode 100644 index 000000000000..432fb78b96cc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/10.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/10_after.xml b/plugins/android/testData/refactoring/inlineLayout/10_after.xml new file mode 100644 index 000000000000..3c39c3a7b1e9 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/10_after.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/10_included.xml b/plugins/android/testData/refactoring/inlineLayout/10_included.xml new file mode 100644 index 000000000000..a0b0b89a54dc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/10_included.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/11.xml b/plugins/android/testData/refactoring/inlineLayout/11.xml new file mode 100644 index 000000000000..27d2a7cf8075 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/11.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/11_after.xml b/plugins/android/testData/refactoring/inlineLayout/11_after.xml new file mode 100644 index 000000000000..533bfb3edb22 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/11_after.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/11_included.xml b/plugins/android/testData/refactoring/inlineLayout/11_included.xml new file mode 100644 index 000000000000..a0b0b89a54dc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/11_included.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/12.xml b/plugins/android/testData/refactoring/inlineLayout/12.xml new file mode 100644 index 000000000000..460a641a9dab --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/12.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/12_after.xml b/plugins/android/testData/refactoring/inlineLayout/12_after.xml new file mode 100644 index 000000000000..717a237560a2 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/12_after.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/12_included.xml b/plugins/android/testData/refactoring/inlineLayout/12_included.xml new file mode 100644 index 000000000000..a0b0b89a54dc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/12_included.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/13.xml b/plugins/android/testData/refactoring/inlineLayout/13.xml new file mode 100644 index 000000000000..f66fb8a50468 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/13.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/13_after.xml b/plugins/android/testData/refactoring/inlineLayout/13_after.xml new file mode 100644 index 000000000000..cfef7670cc56 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/13_after.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/13_included.xml b/plugins/android/testData/refactoring/inlineLayout/13_included.xml new file mode 100644 index 000000000000..a0b0b89a54dc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/13_included.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/14.xml b/plugins/android/testData/refactoring/inlineLayout/14.xml new file mode 100644 index 000000000000..00521b8785fa --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/14.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/14_after.xml b/plugins/android/testData/refactoring/inlineLayout/14_after.xml new file mode 100644 index 000000000000..0b8ffbeec7ed --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/14_after.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/14_included.xml b/plugins/android/testData/refactoring/inlineLayout/14_included.xml new file mode 100644 index 000000000000..a0b0b89a54dc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/14_included.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/15.xml b/plugins/android/testData/refactoring/inlineLayout/15.xml new file mode 100644 index 000000000000..130ff600280a --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/15.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/15_included.xml b/plugins/android/testData/refactoring/inlineLayout/15_included.xml new file mode 100644 index 000000000000..64bc7d040fa4 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/15_included.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/16.xml b/plugins/android/testData/refactoring/inlineLayout/16.xml new file mode 100644 index 000000000000..130ff600280a --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/16.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/16_included.xml b/plugins/android/testData/refactoring/inlineLayout/16_included.xml new file mode 100644 index 000000000000..64bc7d040fa4 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/16_included.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/17.xml b/plugins/android/testData/refactoring/inlineLayout/17.xml new file mode 100644 index 000000000000..73cc1905c349 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/17.xml @@ -0,0 +1,7 @@ + + + nclude layout="@layout/included"/> + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/17_after.xml b/plugins/android/testData/refactoring/inlineLayout/17_after.xml new file mode 100644 index 000000000000..4f1e2160c5fd --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/17_after.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/17_included.xml b/plugins/android/testData/refactoring/inlineLayout/17_included.xml new file mode 100644 index 000000000000..fba76aca4891 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/17_included.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/18.xml b/plugins/android/testData/refactoring/inlineLayout/18.xml new file mode 100644 index 000000000000..b1b42eb09834 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/18.xml @@ -0,0 +1,8 @@ + + + nclude layout="@layout/included"/> + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/18_after.xml b/plugins/android/testData/refactoring/inlineLayout/18_after.xml new file mode 100644 index 000000000000..b8e654710d15 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/18_after.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/18_included.xml b/plugins/android/testData/refactoring/inlineLayout/18_included.xml new file mode 100644 index 000000000000..fba76aca4891 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/18_included.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/19.xml b/plugins/android/testData/refactoring/inlineLayout/19.xml new file mode 100644 index 000000000000..82ad3f2a1c27 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/19.xml @@ -0,0 +1,8 @@ + + + + xtView/> + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/19_included.xml b/plugins/android/testData/refactoring/inlineLayout/19_included.xml new file mode 100644 index 000000000000..fba76aca4891 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/19_included.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/1_after.xml b/plugins/android/testData/refactoring/inlineLayout/1_after.xml new file mode 100644 index 000000000000..d97195a5cf8e --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/1_after.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/1_included.xml b/plugins/android/testData/refactoring/inlineLayout/1_included.xml new file mode 100644 index 000000000000..fba76aca4891 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/1_included.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/2.xml b/plugins/android/testData/refactoring/inlineLayout/2.xml new file mode 100644 index 000000000000..432fb78b96cc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/2.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/20.xml b/plugins/android/testData/refactoring/inlineLayout/20.xml new file mode 100644 index 000000000000..cee084174407 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/20.xml @@ -0,0 +1,7 @@ + + + lude layout="@layout/unknown"/> + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/20_included.xml b/plugins/android/testData/refactoring/inlineLayout/20_included.xml new file mode 100644 index 000000000000..fba76aca4891 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/20_included.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/2_after.xml b/plugins/android/testData/refactoring/inlineLayout/2_after.xml new file mode 100644 index 000000000000..017fdc571efb --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/2_after.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/2_included.xml b/plugins/android/testData/refactoring/inlineLayout/2_included.xml new file mode 100644 index 000000000000..8199c040c69c --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/2_included.xml @@ -0,0 +1,5 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/3.xml b/plugins/android/testData/refactoring/inlineLayout/3.xml new file mode 100644 index 000000000000..432fb78b96cc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/3.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/3_after.xml b/plugins/android/testData/refactoring/inlineLayout/3_after.xml new file mode 100644 index 000000000000..4f13ce2113ba --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/3_after.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/3_included.xml b/plugins/android/testData/refactoring/inlineLayout/3_included.xml new file mode 100644 index 000000000000..1bc01f0be6ab --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/3_included.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/4.xml b/plugins/android/testData/refactoring/inlineLayout/4.xml new file mode 100644 index 000000000000..432fb78b96cc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/4.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/4_after.xml b/plugins/android/testData/refactoring/inlineLayout/4_after.xml new file mode 100644 index 000000000000..1fdd46f71e4a --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/4_after.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/4_included.xml b/plugins/android/testData/refactoring/inlineLayout/4_included.xml new file mode 100644 index 000000000000..a9c7f1f55d2f --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/4_included.xml @@ -0,0 +1,8 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/5.xml b/plugins/android/testData/refactoring/inlineLayout/5.xml new file mode 100644 index 000000000000..432fb78b96cc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/5.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/5_after.xml b/plugins/android/testData/refactoring/inlineLayout/5_after.xml new file mode 100644 index 000000000000..d57a17976619 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/5_after.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/5_included.xml b/plugins/android/testData/refactoring/inlineLayout/5_included.xml new file mode 100644 index 000000000000..d1aa7763e450 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/5_included.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/6.xml b/plugins/android/testData/refactoring/inlineLayout/6.xml new file mode 100644 index 000000000000..d772acd34a5b --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/6.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/6_after.xml b/plugins/android/testData/refactoring/inlineLayout/6_after.xml new file mode 100644 index 000000000000..f2fa163390f3 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/6_after.xml @@ -0,0 +1,14 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/6_included.xml b/plugins/android/testData/refactoring/inlineLayout/6_included.xml new file mode 100644 index 000000000000..a9c7f1f55d2f --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/6_included.xml @@ -0,0 +1,8 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/7.xml b/plugins/android/testData/refactoring/inlineLayout/7.xml new file mode 100644 index 000000000000..b38cca09d5a9 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/7.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/7_after.xml b/plugins/android/testData/refactoring/inlineLayout/7_after.xml new file mode 100644 index 000000000000..d329c61ee793 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/7_after.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/7_included.xml b/plugins/android/testData/refactoring/inlineLayout/7_included.xml new file mode 100644 index 000000000000..d1aa7763e450 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/7_included.xml @@ -0,0 +1,7 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/8.xml b/plugins/android/testData/refactoring/inlineLayout/8.xml new file mode 100644 index 000000000000..432fb78b96cc --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/8.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/8_after.xml b/plugins/android/testData/refactoring/inlineLayout/8_after.xml new file mode 100644 index 000000000000..4585f28858b7 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/8_after.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/8_included.xml b/plugins/android/testData/refactoring/inlineLayout/8_included.xml new file mode 100644 index 000000000000..fba76aca4891 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/8_included.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/9.xml b/plugins/android/testData/refactoring/inlineLayout/9.xml new file mode 100644 index 000000000000..a6ddd4eb44d2 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/9.xml @@ -0,0 +1,8 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/9_after.xml b/plugins/android/testData/refactoring/inlineLayout/9_after.xml new file mode 100644 index 000000000000..4585f28858b7 --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/9_after.xml @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/9_included.xml b/plugins/android/testData/refactoring/inlineLayout/9_included.xml new file mode 100644 index 000000000000..c3233a50d44f --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/9_included.xml @@ -0,0 +1,6 @@ + + \ No newline at end of file diff --git a/plugins/android/testData/refactoring/inlineLayout/MyActivity.java b/plugins/android/testData/refactoring/inlineLayout/MyActivity.java new file mode 100644 index 000000000000..5c53b74d2cdf --- /dev/null +++ b/plugins/android/testData/refactoring/inlineLayout/MyActivity.java @@ -0,0 +1,12 @@ +package p1.p2; + +import android.app.Activity; +import android.view.View; + +public class MyActivity extends Activity { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + int n = R.layout.included; + } +} diff --git a/plugins/android/testSrc/org/jetbrains/android/refactoring/AndroidInlineLayoutTest.java b/plugins/android/testSrc/org/jetbrains/android/refactoring/AndroidInlineLayoutTest.java new file mode 100644 index 000000000000..0ee42919cb2f --- /dev/null +++ b/plugins/android/testSrc/org/jetbrains/android/refactoring/AndroidInlineLayoutTest.java @@ -0,0 +1,192 @@ +package org.jetbrains.android.refactoring; + +import com.intellij.openapi.actionSystem.Presentation; +import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.refactoring.actions.InlineAction; +import com.intellij.util.IncorrectOperationException; +import org.jetbrains.android.AndroidTestCase; + +/** + * @author Eugene.Kudelevsky + */ +public class AndroidInlineLayoutTest extends AndroidTestCase { + private static final String BASE_PATH = "refactoring/inlineLayout/"; + + public void test1() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test2() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test3() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test4() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test5() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test6() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test7() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test8() throws Exception { + doTestCommonInlineAll(); + } + + public void test9() throws Exception { + final String testName = getTestName(true); + myFixture.copyFileToProject(BASE_PATH + testName + ".xml", "res/layout/test.xml"); + final VirtualFile f = myFixture.copyFileToProject(BASE_PATH + testName + "_included.xml", "res/layout/included.xml"); + myFixture.configureFromExistingVirtualFile(f); + AndroidInlineLayoutHandler.setTestConfig(new AndroidInlineTestConfig(true)); + try { + final Presentation p = myFixture.testAction(new InlineAction()); + assertTrue(p.isEnabled()); + assertTrue(p.isVisible()); + } + finally { + AndroidInlineLayoutHandler.setTestConfig(null); + } + myFixture.checkResultByFile("res/layout/test.xml", BASE_PATH + testName + "_after.xml", true); + assertNull(myFixture.getTempDirFixture().getFile("res/layout/included.xml")); + } + + public void test10() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test11() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test12() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test13() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test14() throws Exception { + doTestCommonInlineThisOnly(); + } + + public void test15() throws Exception { + myFixture.copyFileToProject(BASE_PATH + getTestName(true) + "_included.xml", "res/layout-land/included.xml"); + doTestCommonInlineActionError(false, true); + } + + public void test16() throws Exception { + myFixture.copyFileToProject("R.java", "gen/p1/p2/R.java"); + myFixture.copyFileToProject(BASE_PATH + "MyActivity.java", "src/p1/p2/MyActivity.java"); + doTestCommonInlineActionError(false, true); + } + + public void test17() throws Exception { + doTestInlineIncludeAction(true); + } + + public void test18() throws Exception { + doTestInlineIncludeAction(false); + } + + public void test19() throws Exception { + doTestInlineIncludeActionDisabled(); + } + + public void test20() throws Exception { + doTestInlineIncludeActionError(true); + } + + private void doTestCommonInlineThisOnly() throws Exception { + doTestCommonInlineAction(true); + myFixture.checkResultByFile("res/layout/included.xml", + BASE_PATH + getTestName(true) + "_included.xml", true); + } + + private void doTestCommonInlineAll() throws Exception { + doTestCommonInlineAction(false); + assertNull(myFixture.getTempDirFixture().getFile("res/layout/included.xml")); + } + + private void doTestCommonInlineActionError(boolean inlineThisOnly, boolean configureFromIncludedFile) { + final String testName = getTestName(true); + final VirtualFile included = myFixture.copyFileToProject(BASE_PATH + testName + "_included.xml", "res/layout/included.xml"); + final VirtualFile f = myFixture.copyFileToProject(BASE_PATH + testName + ".xml", "res/layout/test.xml"); + myFixture.configureFromExistingVirtualFile(configureFromIncludedFile ? included : f); + AndroidInlineLayoutHandler.setTestConfig(new AndroidInlineTestConfig(inlineThisOnly)); + try { + myFixture.testAction(new InlineAction()); + fail(); + } + catch (IncorrectOperationException e) { + assertTrue(e.getMessage().length() > 0); + } + finally { + AndroidInlineLayoutHandler.setTestConfig(null); + } + } + + private void doTestCommonInlineAction(boolean inlineThisOnly) { + final String testName = getTestName(true); + myFixture.copyFileToProject(BASE_PATH + testName + "_included.xml", "res/layout/included.xml"); + final VirtualFile f = myFixture.copyFileToProject(BASE_PATH + testName + ".xml", "res/layout/test.xml"); + myFixture.configureFromExistingVirtualFile(f); + AndroidInlineLayoutHandler.setTestConfig(new AndroidInlineTestConfig(inlineThisOnly)); + try { + final Presentation p = myFixture.testAction(new InlineAction()); + assertTrue(p.isEnabled()); + assertTrue(p.isVisible()); + } + finally { + AndroidInlineLayoutHandler.setTestConfig(null); + } + myFixture.checkResultByFile(BASE_PATH + testName + "_after.xml", true); + } + + private void doTestInlineIncludeAction(boolean inlineThisOnly) { + final String testName = getTestName(true); + myFixture.copyFileToProject(BASE_PATH + testName + "_included.xml", "res/layout/included.xml"); + final VirtualFile f = myFixture.copyFileToProject(BASE_PATH + testName + ".xml", "res/layout/test.xml"); + myFixture.configureFromExistingVirtualFile(f); + final Presentation p = myFixture.testAction(new AndroidInlineIncludeAction(new AndroidInlineTestConfig(inlineThisOnly))); + assertTrue(p.isEnabled()); + assertTrue(p.isVisible()); + myFixture.checkResultByFile(BASE_PATH + testName + "_after.xml", true); + } + + private void doTestInlineIncludeActionDisabled() { + final String testName = getTestName(true); + myFixture.copyFileToProject(BASE_PATH + testName + "_included.xml", "res/layout/included.xml"); + final VirtualFile f = myFixture.copyFileToProject(BASE_PATH + testName + ".xml", "res/layout/test.xml"); + myFixture.configureFromExistingVirtualFile(f); + final Presentation p = myFixture.testAction(new AndroidInlineIncludeAction(new AndroidInlineTestConfig(true))); + assertTrue(p.isVisible()); + assertFalse(p.isEnabled()); + } + + private void doTestInlineIncludeActionError(boolean inlineThisOnly) { + final String testName = getTestName(true); + myFixture.copyFileToProject(BASE_PATH + testName + "_included.xml", "res/layout/included.xml"); + final VirtualFile f = myFixture.copyFileToProject(BASE_PATH + testName + ".xml", "res/layout/test.xml"); + myFixture.configureFromExistingVirtualFile(f); + try { + myFixture.testAction(new AndroidInlineIncludeAction(new AndroidInlineTestConfig(inlineThisOnly))); + fail(); + } + catch (IncorrectOperationException e) { + assertTrue(e.getMessage().length() > 0); + } + } +} From 03e883689fdfe3291022c69bf8af03ec6fadaaef Mon Sep 17 00:00:00 2001 From: Eugene Kudelevsky Date: Tue, 21 Aug 2012 17:04:40 +0400 Subject: [PATCH 08/27] do not copy R file into lib package of app module --- .../org/jetbrains/android/dom/AndroidLibraryProjectTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java index 3783096f7ee2..466952951c9f 100644 --- a/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java +++ b/plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java @@ -240,10 +240,8 @@ public class AndroidLibraryProjectTest extends UsefulTestCase { myFixture.copyFileToProject(BASE_PATH + "FindUsagesClass1.java", "app/src/p1/p2/lib/Class.java"); myFixture.copyFileToProject(BASE_PATH + "FindUsagesClass1.java", "lib/src/p1/p2/lib/Class.java"); myFixture.copyFileToProject(BASE_PATH + "FindUsagesStyles.xml", "app/res/values/styles.xml"); - //myFixture.copyFileToProject(BASE_PATH + "FindUsagesStyles2.xml", "lib/res/values/styles2.xml"); myFixture.copyFileToProject(BASE_PATH + "picture1.png", "lib/res/drawable/picture1.png"); myFixture.copyFileToProject("R.java", "app/src/p1/p2/R.java"); - myFixture.copyFileToProject(BASE_PATH + "LibR.java", "app/src/p1/p2/lib/R.java"); myFixture.copyFileToProject(BASE_PATH + "LibR.java", "lib/src/p1/p2/lib/R.java"); Collection references = findCodeUsages(getTestName(false) + "." + extension, dir); assertEquals(buildFileList(references), 5, references.size()); From a5c50473a3b575b3267ebebbe35aac00cf11eda5 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 21 Aug 2012 17:04:40 +0400 Subject: [PATCH 09/27] lambda: skip some cyclic inference cases --- .../src/com/intellij/psi/LambdaUtil.java | 133 +++++++++++++++++- .../psi/impl/source/PsiParameterImpl.java | 3 +- .../source/resolve/PsiResolveHelperImpl.java | 2 +- .../tree/java/PsiLambdaExpressionImpl.java | 108 +------------- .../InferenceOnMethodCallSite.java | 2 +- .../highlighting/NoInferenceResult.java | 2 +- .../highlighting/ReturnTypeCompatibility.java | 2 +- 7 files changed, 135 insertions(+), 117 deletions(-) diff --git a/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java b/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java index 51eaf1ca9e85..516bd254fdc4 100644 --- a/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/LambdaUtil.java @@ -28,6 +28,7 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.Map; /** * User: anna @@ -76,8 +77,7 @@ public class LambdaUtil { public static boolean isLambdaFullyInferred(PsiLambdaExpression expression, PsiType functionalInterfaceType) { if (expression.getParameterList().getParametersCount() > 0 || getFunctionalInterfaceReturnType(functionalInterfaceType) != PsiType.VOID) { //todo check that void lambdas without params check - final Boolean accept = functionalInterfaceType.accept(new TypeParamsChecker(expression)); - return accept == null || !accept.booleanValue(); + return !dependsOnTypeParams(functionalInterfaceType, expression); } return true; } @@ -262,7 +262,9 @@ public class LambdaUtil { } public static boolean dependsOnTypeParams(PsiType type, PsiLambdaExpression expr) { - final Boolean accept = type.accept(new TypeParamsChecker(expr)); + final TypeParamsChecker visitor = new TypeParamsChecker(expr); + if (!visitor.startedInference()) return false; + final Boolean accept = type.accept(visitor); return accept != null && accept.booleanValue(); } @@ -292,11 +294,130 @@ public class LambdaUtil { return independent[0]; } + @Nullable + public static PsiType getFunctionalInterfaceType(PsiLambdaExpression expression, final boolean tryToSubstitute) { + PsiElement parent = expression.getParent(); + while (parent instanceof PsiParenthesizedExpression) { + parent = parent.getParent(); + } + PsiType type = null; + if (parent instanceof PsiTypeCastExpression) { + type = ((PsiTypeCastExpression)parent).getType(); + } + else if (parent instanceof PsiVariable) { + type = ((PsiVariable)parent).getType(); + } + else if (parent instanceof PsiAssignmentExpression) { + final PsiExpression lExpression = ((PsiAssignmentExpression)parent).getLExpression(); + type = lExpression.getType(); + } + else if (parent instanceof PsiExpressionList) { + final PsiExpressionList expressionList = (PsiExpressionList)parent; + int lambdaIdx = getLambdaIdx(expressionList, expression); + if (lambdaIdx > -1) { + if (tryToSubstitute) { + final PsiElement gParent = expressionList.getParent(); + if (gParent instanceof PsiMethodCallExpression) { + final PsiMethodCallExpression contextCall = (PsiMethodCallExpression)gParent; + final JavaResolveResult resolveResult = contextCall.resolveMethodGenerics(); + final PsiElement resolve = resolveResult.getElement(); + if (resolve instanceof PsiMethod) { + final PsiParameter[] parameters = ((PsiMethod)resolve).getParameterList().getParameters(); + if (lambdaIdx < parameters.length) { + type = parameters[lambdaIdx].getType(); + final PsiType psiType = type; + type = PsiResolveHelper.ourGuard.doPreventingRecursion(expression, true, new Computable() { + @Override + public PsiType compute() { + return resolveResult.getSubstitutor().substitute(psiType); + } + }); + } + } + } + } else { + final Map currentMethodCandidates = MethodCandidateInfo.CURRENT_CANDIDATE.get(); + final PsiMethod method = currentMethodCandidates != null ? currentMethodCandidates.get(parent) : null; + if (method != null) { + final PsiParameter[] parameters = method.getParameterList().getParameters(); + if (lambdaIdx < parameters.length) { + type = parameters[lambdaIdx].getType(); + } + } + } + } + } + else if (parent instanceof PsiReturnStatement) { + final PsiMethod method = PsiTreeUtil.getParentOfType(parent, PsiMethod.class); + if (method != null) { + type = method.getReturnType(); + } + } + else if (parent instanceof PsiLambdaExpression) { + final PsiType parentInterfaceType = ((PsiLambdaExpression)parent).getFunctionalInterfaceType(); + if (parentInterfaceType != null) { + type = getFunctionalInterfaceReturnType(parentInterfaceType); + } + } + return type; + } + + public static PsiType getLambdaParameterType(PsiParameter param) { + final PsiElement paramParent = param.getParent(); + if (paramParent instanceof PsiParameterList) { + final int parameterIndex = ((PsiParameterList)paramParent).getParameterIndex(param); + if (parameterIndex > -1) { + final PsiLambdaExpression lambdaExpression = PsiTreeUtil.getParentOfType(param, PsiLambdaExpression.class); + PsiType type = getFunctionalInterfaceType(lambdaExpression, true); + if (type == null) { + type = getFunctionalInterfaceType(lambdaExpression, false); + } + final PsiClassType.ClassResolveResult resolveResult = type instanceof PsiClassType ? ((PsiClassType)type).resolveGenerics() : null; + if (resolveResult != null) { + final PsiMethod method = getFunctionalInterfaceMethod(type); + if (method != null) { + final PsiParameter[] parameters = method.getParameterList().getParameters(); + if (parameterIndex < parameters.length) { + final PsiType psiType = resolveResult.getSubstitutor().substitute(parameters[parameterIndex].getType()); + if (!dependsOnTypeParams(psiType, lambdaExpression)) { + if (psiType instanceof PsiWildcardType) { + final PsiType bound = ((PsiWildcardType)psiType).getBound(); + if (bound != null) { + return bound; + } + } + return psiType; + } + } + } + } + } + } + return new PsiLambdaParameterType(param); + } + private static class TypeParamsChecker extends PsiTypeVisitor { private final PsiLambdaExpression myExpression; + private PsiMethod myMethod; + protected final PsiClass myClass; public TypeParamsChecker(PsiLambdaExpression expression) { myExpression = expression; + myClass = PsiUtil.resolveGenericsClassInType(getFunctionalInterfaceType(expression, false)).getElement(); + PsiElement parent = expression.getParent(); + while (parent instanceof PsiParenthesizedExpression) { + parent = parent.getParent(); + } + if (parent instanceof PsiExpressionList) { + final PsiElement gParent = parent.getParent(); + if (gParent instanceof PsiCallExpression) { + myMethod = ((PsiCallExpression)gParent).resolveMethod(); + } + } + } + + public boolean startedInference() { + return myMethod != null; } @Override @@ -307,7 +428,11 @@ public class LambdaUtil { } final PsiClass resolve = classType.resolve(); if (resolve instanceof PsiTypeParameter) { - if (!PsiTreeUtil.isAncestor(((PsiTypeParameter)resolve).getOwner(), myExpression, false)) { + final PsiTypeParameterListOwner owner = ((PsiTypeParameter)resolve).getOwner(); + if (owner == myMethod) { + return true; + } + else if (owner == myClass) { return true; } } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java index b409b9bdcb97..89717007ca90 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java @@ -29,7 +29,6 @@ import com.intellij.psi.impl.java.stubs.PsiParameterStub; import com.intellij.psi.impl.source.tree.ChildRole; import com.intellij.psi.impl.source.tree.CompositeElement; import com.intellij.psi.impl.source.tree.JavaSharedImplUtil; -import com.intellij.psi.impl.source.tree.java.PsiLambdaExpressionImpl; import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.SearchScope; import com.intellij.ui.RowIcon; @@ -122,7 +121,7 @@ public class PsiParameterImpl extends JavaStubPsiElement imple final PsiTypeElement typeElement = getTypeElement(); if (typeElement == null && isLambdaParameter()) { - return PsiLambdaExpressionImpl.getLambdaParameterType(this); + return LambdaUtil.getLambdaParameterType(this); } return JavaSharedImplUtil.getType(typeElement, getNameIdentifier(), this); diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java index eeb81a761094..1800505685c0 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/resolve/PsiResolveHelperImpl.java @@ -878,7 +878,7 @@ public class PsiResolveHelperImpl implements PsiResolveHelper { if (argumentList != null && PsiUtil.getLanguageLevel(argumentList).isAtLeast(LanguageLevel.JDK_1_8)) { for (PsiExpression expression : argumentList.getExpressions()) { if (expression instanceof PsiLambdaExpression) { - final PsiType functionalInterfaceType = PsiLambdaExpressionImpl.getFunctionalInterfaceType(((PsiLambdaExpression)expression), false); + final PsiType functionalInterfaceType = LambdaUtil.getFunctionalInterfaceType((PsiLambdaExpression)expression, false); if (functionalInterfaceType == null || PsiUtil.resolveClassInType(functionalInterfaceType) == typeParameter){ return getFailedInferenceConstraint(typeParameter); } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java index bcbcf0a7fe9c..8dbe35ca0d8a 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/tree/java/PsiLambdaExpressionImpl.java @@ -15,14 +15,11 @@ */ package com.intellij.psi.impl.source.tree.java; -import com.intellij.openapi.util.*; import com.intellij.psi.*; import com.intellij.psi.controlFlow.*; import com.intellij.psi.impl.PsiImplUtil; import com.intellij.psi.impl.source.tree.JavaElementType; -import com.intellij.psi.infos.MethodCandidateInfo; import com.intellij.psi.scope.PsiScopeProcessor; -import com.intellij.psi.util.MethodSignature; import com.intellij.psi.util.PsiTreeUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -30,7 +27,6 @@ import org.jetbrains.annotations.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; public class PsiLambdaExpressionImpl extends ExpressionPsiElement implements PsiLambdaExpression { @@ -89,7 +85,7 @@ public class PsiLambdaExpressionImpl extends ExpressionPsiElement implements Psi @Nullable @Override public PsiType getFunctionalInterfaceType() { - return getFunctionalInterfaceType(this, true); + return LambdaUtil.getFunctionalInterfaceType(this, true); } @Override @@ -110,74 +106,6 @@ public class PsiLambdaExpressionImpl extends ExpressionPsiElement implements Psi return true; } - @Nullable - public static PsiType getFunctionalInterfaceType(PsiLambdaExpression expression, final boolean tryToSubstitute) { - PsiElement parent = expression.getParent(); - while (parent instanceof PsiParenthesizedExpression) { - parent = parent.getParent(); - } - PsiType type = null; - if (parent instanceof PsiTypeCastExpression) { - type = ((PsiTypeCastExpression)parent).getType(); - } - else if (parent instanceof PsiVariable) { - type = ((PsiVariable)parent).getType(); - } - else if (parent instanceof PsiAssignmentExpression) { - final PsiExpression lExpression = ((PsiAssignmentExpression)parent).getLExpression(); - type = lExpression.getType(); - } - else if (parent instanceof PsiExpressionList) { - final PsiExpressionList expressionList = (PsiExpressionList)parent; - int lambdaIdx = LambdaUtil.getLambdaIdx(expressionList, expression); - if (lambdaIdx > -1) { - if (tryToSubstitute) { - final PsiElement gParent = expressionList.getParent(); - if (gParent instanceof PsiMethodCallExpression) { - final PsiMethodCallExpression contextCall = (PsiMethodCallExpression)gParent; - final JavaResolveResult resolveResult = contextCall.resolveMethodGenerics(); - final PsiElement resolve = resolveResult.getElement(); - if (resolve instanceof PsiMethod) { - final PsiParameter[] parameters = ((PsiMethod)resolve).getParameterList().getParameters(); - if (lambdaIdx < parameters.length) { - type = parameters[lambdaIdx].getType(); - final PsiType psiType = type; - type = PsiResolveHelper.ourGuard.doPreventingRecursion(expression, true, new Computable() { - @Override - public PsiType compute() { - return resolveResult.getSubstitutor().substitute(psiType); - } - }); - } - } - } - } else { - final Map currentMethodCandidates = MethodCandidateInfo.CURRENT_CANDIDATE.get(); - final PsiMethod method = currentMethodCandidates != null ? currentMethodCandidates.get(parent) : null; - if (method != null) { - final PsiParameter[] parameters = method.getParameterList().getParameters(); - if (lambdaIdx < parameters.length) { - type = parameters[lambdaIdx].getType(); - } - } - } - } - } - else if (parent instanceof PsiReturnStatement) { - final PsiMethod method = PsiTreeUtil.getParentOfType(parent, PsiMethod.class); - if (method != null) { - type = method.getReturnType(); - } - } - else if (parent instanceof PsiLambdaExpression) { - final PsiType parentInterfaceType = ((PsiLambdaExpression)parent).getFunctionalInterfaceType(); - if (parentInterfaceType != null) { - type = LambdaUtil.getFunctionalInterfaceReturnType(parentInterfaceType); - } - } - return type; - } - @Override public PsiType getType() { return new PsiLambdaExpressionType(this); @@ -205,38 +133,4 @@ public class PsiLambdaExpressionImpl extends ExpressionPsiElement implements Psi public String toString() { return "PsiLambdaExpression:" + getText(); } - - public static PsiType getLambdaParameterType(PsiParameter param) { - final PsiElement paramParent = param.getParent(); - if (paramParent instanceof PsiParameterList) { - final int parameterIndex = ((PsiParameterList)paramParent).getParameterIndex(param); - if (parameterIndex > -1) { - final PsiLambdaExpression lambdaExpression = PsiTreeUtil.getParentOfType(param, PsiLambdaExpression.class); - PsiType type = getFunctionalInterfaceType(lambdaExpression, true); - if (type == null) { - type = getFunctionalInterfaceType(lambdaExpression, false); - } - final PsiClassType.ClassResolveResult resolveResult = type instanceof PsiClassType ? ((PsiClassType)type).resolveGenerics() : null; - if (resolveResult != null) { - final PsiMethod method = LambdaUtil.getFunctionalInterfaceMethod(type); - if (method != null) { - final PsiParameter[] parameters = method.getParameterList().getParameters(); - if (parameterIndex < parameters.length) { - final PsiType psiType = resolveResult.getSubstitutor().substitute(parameters[parameterIndex].getType()); - if (!LambdaUtil.dependsOnTypeParams(psiType, lambdaExpression)) { - if (psiType instanceof PsiWildcardType) { - final PsiType bound = ((PsiWildcardType)psiType).getBound(); - if (bound != null) { - return bound; - } - } - return psiType; - } - } - } - } - } - } - return new PsiLambdaParameterType(param); - } } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/InferenceOnMethodCallSite.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/InferenceOnMethodCallSite.java index 300c7962a525..eb8f8d78a1dd 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/InferenceOnMethodCallSite.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/InferenceOnMethodCallSite.java @@ -8,7 +8,7 @@ class InferenceOnMethodCallSite { void m(In s) { } { - m(( ) -> Collections.emptyList()); + m(() -> Collections.emptyList()); m((In)() -> Collections.emptyList(), () -> new ArrayList()); m(() ->Collections.emptyList(), () -> new ArrayList()); m(() -> Collections.emptyList()); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/NoInferenceResult.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/NoInferenceResult.java index 2f8cb5250789..0864c82fbda3 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/NoInferenceResult.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/NoInferenceResult.java @@ -7,7 +7,7 @@ class NoInferenceResult { void m1(T t) { } void test() { - m((String s1) -> (String s2) -> s1 + s2); + m((String s1) -> (String s2) -> s1 + s2); m((String s1) -> s1.length()); m((String s1) -> s1); diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ReturnTypeCompatibility.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ReturnTypeCompatibility.java index 4cc91541a566..f558cf725f99 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ReturnTypeCompatibility.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/highlighting/ReturnTypeCompatibility.java @@ -57,7 +57,7 @@ class ReturnTypeCompatibility { } public static void main(String[] args) { - call(i-> {return i;}); + call(i-> {return i;}); } } From 78aab52558ea452e2690cbf2709dd3e346007d0a Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 21 Aug 2012 17:05:37 +0400 Subject: [PATCH 10/27] unneeded files deleted from testData - 2 --- .../addAnnotationTarget/.idea/compiler.xml | 21 ------------------- .../addAnnotationTarget/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../classAsArgument/.idea/compiler.xml | 21 ------------------- .../classAsArgument/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../metaAnnotationChanged/.idea/compiler.xml | 21 ------------------- .../metaAnnotationChanged/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../removeAnnotationTarget/.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../changeClassName/.idea/compiler.xml | 21 ------------------- .../changeClassName/.idea/encodings.xml | 5 ----- .../addStatic/.idea/compiler.xml | 21 ------------------- .../addStatic/.idea/encodings.xml | 5 ----- .../decAccess/.idea/compiler.xml | 21 ------------------- .../decAccess/.idea/encodings.xml | 5 ----- .../dropAbstract/.idea/compiler.xml | 21 ------------------- .../dropAbstract/.idea/encodings.xml | 5 ----- .../removeStatic/.idea/compiler.xml | 21 ------------------- .../removeStatic/.idea/encodings.xml | 5 ----- .../setAbstract/.idea/compiler.xml | 21 ------------------- .../setAbstract/.idea/encodings.xml | 5 ----- .../setFinal/.idea/compiler.xml | 21 ------------------- .../setFinal/.idea/encodings.xml | 5 ----- .../setFinal1/.idea/compiler.xml | 21 ------------------- .../setFinal1/.idea/encodings.xml | 5 ----- .../addExtends/.idea/compiler.xml | 21 ------------------- .../addExtends/.idea/encodings.xml | 5 ----- .../addImplements/.idea/compiler.xml | 21 ------------------- .../addImplements/.idea/encodings.xml | 5 ----- .../changeExtends/.idea/compiler.xml | 21 ------------------- .../changeExtends/.idea/encodings.xml | 5 ----- .../changeExtends2/.idea/compiler.xml | 21 ------------------- .../changeExtends2/.idea/encodings.xml | 5 ----- .../removeExtends/.idea/compiler.xml | 21 ------------------- .../removeExtends/.idea/encodings.xml | 5 ----- .../removeImplements/.idea/compiler.xml | 21 ------------------- .../removeImplements/.idea/encodings.xml | 5 ----- .../removeImplements2/.idea/compiler.xml | 21 ------------------- .../removeImplements2/.idea/encodings.xml | 5 ----- .../removeImplements3/.idea/compiler.xml | 21 ------------------- .../removeImplements3/.idea/encodings.xml | 5 ----- .../common/addClass/.idea/compiler.xml | 21 ------------------- .../common/addClass/.idea/encodings.xml | 5 ----- .../common/anonymous/.idea/compiler.xml | 21 ------------------- .../common/anonymous/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../class2Interface1/.idea/compiler.xml | 21 ------------------- .../class2Interface1/.idea/encodings.xml | 5 ----- .../class2Interface2/.idea/compiler.xml | 21 ------------------- .../class2Interface2/.idea/encodings.xml | 5 ----- .../class2Interface3/.idea/compiler.xml | 21 ------------------- .../class2Interface3/.idea/encodings.xml | 5 ----- .../common/deleteClass/.idea/compiler.xml | 21 ------------------- .../common/deleteClass/.idea/encodings.xml | 5 ----- .../common/deleteClass1/.idea/compiler.xml | 21 ------------------- .../common/deleteClass1/.idea/encodings.xml | 5 ----- .../common/deleteClass2/.idea/compiler.xml | 21 ------------------- .../common/deleteClass2/.idea/encodings.xml | 5 ----- .../common/deleteClass3/.idea/compiler.xml | 21 ------------------- .../common/deleteClass3/.idea/encodings.xml | 5 ----- .../common/deleteClass4/.idea/compiler.xml | 21 ------------------- .../common/deleteClass4/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../dependencyUpdate/.idea/compiler.xml | 21 ------------------- .../dependencyUpdate/.idea/encodings.xml | 5 ----- .../common/inner/.idea/compiler.xml | 21 ------------------- .../common/inner/.idea/encodings.xml | 5 ----- .../noResourceDelete/.idea/compiler.xml | 21 ------------------- .../noResourceDelete/.idea/encodings.xml | 5 ----- .../noSecondFileCompile/.idea/compiler.xml | 21 ------------------- .../noSecondFileCompile/.idea/encodings.xml | 5 ----- .../noSecondFileCompile1/.idea/compiler.xml | 21 ------------------- .../noSecondFileCompile1/.idea/encodings.xml | 5 ----- .../setFinal/.idea/compiler.xml | 21 ------------------- .../setFinal/.idea/encodings.xml | 5 ----- .../setPrivate/.idea/compiler.xml | 21 ------------------- .../setPrivate/.idea/encodings.xml | 5 ----- .../setProtected/.idea/compiler.xml | 21 ------------------- .../setProtected/.idea/encodings.xml | 5 ----- .../setStatic/.idea/compiler.xml | 21 ------------------- .../setStatic/.idea/encodings.xml | 5 ----- .../unsetStatic/.idea/compiler.xml | 21 ------------------- .../unsetStatic/.idea/encodings.xml | 5 ----- .../unsetStaticFinal/.idea/compiler.xml | 21 ------------------- .../unsetStaticFinal/.idea/encodings.xml | 5 ----- .../constantChain/.idea/compiler.xml | 21 ------------------- .../constantChain/.idea/encodings.xml | 5 ----- .../constantChain1/.idea/compiler.xml | 21 ------------------- .../constantChain1/.idea/encodings.xml | 5 ----- .../constantChain2/.idea/compiler.xml | 21 ------------------- .../constantChain2/.idea/encodings.xml | 5 ----- .../constantRemove/.idea/compiler.xml | 21 ------------------- .../constantRemove/.idea/encodings.xml | 5 ----- .../constantRemove1/.idea/compiler.xml | 21 ------------------- .../constantRemove1/.idea/encodings.xml | 5 ----- .../doubleConstantChange/.idea/compiler.xml | 21 ------------------- .../doubleConstantChange/.idea/encodings.xml | 5 ----- .../floatConstantChange/.idea/compiler.xml | 21 ------------------- .../floatConstantChange/.idea/encodings.xml | 5 ----- .../innerConstantChange/.idea/compiler.xml | 21 ------------------- .../innerConstantChange/.idea/encodings.xml | 5 ----- .../intConstantChange/.idea/compiler.xml | 21 ------------------- .../intConstantChange/.idea/encodings.xml | 5 ----- .../longConstantChange/.idea/compiler.xml | 21 ------------------- .../longConstantChange/.idea/encodings.xml | 5 ----- .../nonCompileTimeConstant/.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../nonIncremental1/.idea/compiler.xml | 21 ------------------- .../nonIncremental1/.idea/encodings.xml | 5 ----- .../nonIncremental2/.idea/compiler.xml | 21 ------------------- .../nonIncremental2/.idea/encodings.xml | 5 ----- .../nonIncremental4/.idea/compiler.xml | 21 ------------------- .../nonIncremental4/.idea/encodings.xml | 5 ----- .../stringConstantChange/.idea/compiler.xml | 21 ------------------- .../stringConstantChange/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../typeChange/.idea/compiler.xml | 21 ------------------- .../typeChange/.idea/encodings.xml | 5 ----- .../typeChange1/.idea/compiler.xml | 21 ------------------- .../typeChange1/.idea/encodings.xml | 5 ----- .../typeChange2/.idea/compiler.xml | 21 ------------------- .../typeChange2/.idea/encodings.xml | 5 ----- .../addMethodToBase/.idea/compiler.xml | 21 ------------------- .../addMethodToBase/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../generics/changeBound/.idea/compiler.xml | 21 ------------------- .../generics/changeBound/.idea/encodings.xml | 5 ----- .../generics/changeBound1/.idea/compiler.xml | 21 ------------------- .../generics/changeBound1/.idea/encodings.xml | 5 ----- .../changeBoundClass1/.idea/compiler.xml | 21 ------------------- .../changeBoundClass1/.idea/encodings.xml | 5 ----- .../changeBoundInterface1/.idea/compiler.xml | 21 ------------------- .../changeBoundInterface1/.idea/encodings.xml | 5 ----- .../changeBoundedClass/.idea/compiler.xml | 21 ------------------- .../changeBoundedClass/.idea/encodings.xml | 5 ----- .../generics/changeExtends/.idea/compiler.xml | 21 ------------------- .../changeExtends/.idea/encodings.xml | 5 ----- .../changeExtends1/.idea/compiler.xml | 21 ------------------- .../changeExtends1/.idea/encodings.xml | 5 ----- .../changeExtends2/.idea/compiler.xml | 21 ------------------- .../changeExtends2/.idea/encodings.xml | 5 ----- .../changeImplements/.idea/compiler.xml | 21 ------------------- .../changeImplements/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../changeVarargSignature/.idea/compiler.xml | 21 ------------------- .../changeVarargSignature/.idea/encodings.xml | 5 ----- .../changeVarargSignature1/.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../generics/covariance/.idea/compiler.xml | 21 ------------------- .../generics/covariance/.idea/encodings.xml | 5 ----- .../generics/covariance1/.idea/compiler.xml | 21 ------------------- .../generics/covariance1/.idea/encodings.xml | 5 ----- .../generics/covariance2/.idea/compiler.xml | 21 ------------------- .../generics/covariance2/.idea/encodings.xml | 5 ----- .../covarianceNoChanges/.idea/compiler.xml | 21 ------------------- .../covarianceNoChanges/.idea/encodings.xml | 5 ----- .../generics/degenerify/.idea/compiler.xml | 21 ------------------- .../generics/degenerify/.idea/encodings.xml | 5 ----- .../generics/degenerify1/.idea/compiler.xml | 21 ------------------- .../generics/degenerify1/.idea/encodings.xml | 5 ----- .../fieldTypeChange/.idea/compiler.xml | 21 ------------------- .../fieldTypeChange/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../overrideAnnotatedInner/.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../generics/paramTypes/.idea/compiler.xml | 21 ------------------- .../generics/paramTypes/.idea/encodings.xml | 5 ----- .../generics/returnType/.idea/compiler.xml | 21 ------------------- .../generics/returnType/.idea/encodings.xml | 5 ----- .../imports/classImport/.idea/compiler.xml | 21 ------------------- .../imports/classImport/.idea/encodings.xml | 5 ----- .../imports/staticImport/.idea/compiler.xml | 21 ------------------- .../imports/staticImport/.idea/encodings.xml | 5 ----- .../addAbstractMethod/.idea/compiler.xml | 21 ------------------- .../addAbstractMethod/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../addFieldToBaseClass/.idea/compiler.xml | 21 ------------------- .../addFieldToBaseClass/.idea/encodings.xml | 5 ----- .../addFieldToDerived/.idea/compiler.xml | 21 ------------------- .../addFieldToDerived/.idea/encodings.xml | 5 ----- .../addFieldToInterface/.idea/compiler.xml | 21 ------------------- .../addFieldToInterface/.idea/encodings.xml | 5 ----- .../addFieldToInterface2/.idea/compiler.xml | 21 ------------------- .../addFieldToInterface2/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../addHidingField/.idea/compiler.xml | 21 ------------------- .../addHidingField/.idea/encodings.xml | 5 ----- .../addHidingMethod/.idea/compiler.xml | 21 ------------------- .../addHidingMethod/.idea/encodings.xml | 5 ----- .../addInterfaceMethod/.idea/compiler.xml | 21 ------------------- .../addInterfaceMethod/.idea/encodings.xml | 5 ----- .../addInterfaceMethod2/.idea/compiler.xml | 21 ------------------- .../addInterfaceMethod2/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../addMethod/.idea/compiler.xml | 21 ------------------- .../addMethod/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../addMoreSpecific/.idea/compiler.xml | 21 ------------------- .../addMoreSpecific/.idea/encodings.xml | 5 ----- .../addMoreSpecific1/.idea/compiler.xml | 21 ------------------- .../addMoreSpecific1/.idea/encodings.xml | 5 ----- .../addMoreSpecific2/.idea/compiler.xml | 21 ------------------- .../addMoreSpecific2/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../deleteConstructor/.idea/compiler.xml | 21 ------------------- .../deleteConstructor/.idea/encodings.xml | 5 ----- .../deleteInner/.idea/compiler.xml | 21 ------------------- .../deleteInner/.idea/encodings.xml | 5 ----- .../deleteInterfaceMethod/.idea/compiler.xml | 21 ------------------- .../deleteInterfaceMethod/.idea/encodings.xml | 5 ----- .../deleteMethod/.idea/compiler.xml | 21 ------------------- .../deleteMethod/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../hierarchy/.idea/compiler.xml | 21 ------------------- .../hierarchy/.idea/encodings.xml | 5 ----- .../hierarchy2/.idea/compiler.xml | 21 ------------------- .../hierarchy2/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../removeHidingField/.idea/compiler.xml | 21 ------------------- .../removeHidingField/.idea/encodings.xml | 5 ----- .../removeHidingMethod/.idea/compiler.xml | 21 ------------------- .../removeHidingMethod/.idea/encodings.xml | 5 ----- .../renameMethod/.idea/compiler.xml | 21 ------------------- .../renameMethod/.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../decConstructorAccess/.idea/compiler.xml | 21 ------------------- .../decConstructorAccess/.idea/encodings.xml | 5 ----- .../incAccess/.idea/compiler.xml | 21 ------------------- .../incAccess/.idea/encodings.xml | 5 ----- .../setAbstract/.idea/compiler.xml | 21 ------------------- .../setAbstract/.idea/encodings.xml | 5 ----- .../setFinal/.idea/compiler.xml | 21 ------------------- .../setFinal/.idea/encodings.xml | 5 ----- .../setPrivate/.idea/compiler.xml | 21 ------------------- .../setPrivate/.idea/encodings.xml | 5 ----- .../setProtected/.idea/compiler.xml | 21 ------------------- .../setProtected/.idea/encodings.xml | 5 ----- .../setStatic/.idea/compiler.xml | 21 ------------------- .../setStatic/.idea/encodings.xml | 5 ----- .../unsetFinal/.idea/compiler.xml | 21 ------------------- .../unsetFinal/.idea/encodings.xml | 5 ----- .../unsetStatic/.idea/compiler.xml | 21 ------------------- .../unsetStatic/.idea/encodings.xml | 5 ----- .../addThrows/.idea/compiler.xml | 21 ------------------- .../addThrows/.idea/encodings.xml | 5 ----- .../changeReturnType/.idea/compiler.xml | 21 ------------------- .../changeReturnType/.idea/encodings.xml | 5 ----- .../changeReturnType1/.idea/compiler.xml | 21 ------------------- .../changeReturnType1/.idea/encodings.xml | 5 ----- .../changeSignature/.idea/compiler.xml | 21 ------------------- .../changeSignature/.idea/encodings.xml | 5 ----- .../changeSignature1/.idea/compiler.xml | 21 ------------------- .../changeSignature1/.idea/encodings.xml | 5 ----- .../packageInfoNoRecompile/.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- .../.idea/compiler.xml | 21 ------------------- .../.idea/encodings.xml | 5 ----- 338 files changed, 4394 deletions(-) delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/addClass/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/addClass/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/inner/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/inner/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/encodings.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/compiler.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/encodings.xml diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/addClass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/addClass/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/addClass/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/addClass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/addClass/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/addClass/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/inner/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/inner/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/inner/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/inner/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/compiler.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/compiler.xml deleted file mode 100644 index a1b41c52c724..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/compiler.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/encodings.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/encodings.xml deleted file mode 100644 index e206d70d8595..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - From 7dfb6bbcc074b8c1e496b9569691202037ced708 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 21 Aug 2012 17:25:52 +0400 Subject: [PATCH 11/27] unneeded files deleted from testData - 3 --- .../addAnnotationTarget/.idea/misc.xml | 70 --------------- .../addAnnotationTarget/.idea/modules.xml | 9 -- .../AddAnnotationTarget.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- ...ddAnnotationTypeMemberWithDefaultValue.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- ...dAnnotationTypeMemberWithDefaultValue2.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- ...nnotationTypeMemberWithoutDefaultValue.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../AddDefaultToAnnotationMember.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeAnnotationRetentionPolicy.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeAnnotationRetentionPolicy1.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeAnnotationRetentionPolicy2.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeAnnotationRetentionPolicy3.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeAnnotationRetentionPolicy4.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeAnnotationTypeMemberType.iml | 12 --- .../annotations/classAsArgument.log | 4 +- .../annotations/classAsArgument/.idea/ant.xml | 7 -- .../classAsArgument/.idea/misc.xml | 26 ------ .../classAsArgument/.idea/modules.xml | 9 -- .../classAsArgument/classAsArgument.iml | 12 --- .../conservativeNonIncremental/.idea/ant.xml | 7 -- .../conservativeNonIncremental1/.idea/ant.xml | 7 -- .../metaAnnotationChanged/.idea/misc.xml | 70 --------------- .../metaAnnotationChanged/.idea/modules.xml | 9 -- .../MetaAnnotationChanged.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../MetaAnnotationChangedCascade.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../MetaAnnotationChangedCascade2.iml | 12 --- .../removeAnnotationTarget/.idea/misc.xml | 70 --------------- .../removeAnnotationTarget/.idea/modules.xml | 9 -- .../RemoveAnnotationTarget.iml | 12 --- .../removeAnnotationTypeMember/.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../RemoveAnnotationTypeMember.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../RemoveAnnotationTypeMember1.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../RemoveDefaultFromAnnotationMember.iml | 12 --- .../changeName/changeClassName/.idea/misc.xml | 70 --------------- .../changeClassName/.idea/modules.xml | 9 -- .../changeClassName/ChangeClassName.iml | 12 --- .../classModifiers/addStatic/.idea/ant.xml | 7 -- .../classModifiers/addStatic/.idea/misc.xml | 73 --------------- .../addStatic/.idea/modules.xml | 9 -- .../classModifiers/addStatic/AddStatic.iml | 12 --- .../classModifiers/decAccess/.idea/misc.xml | 70 --------------- .../decAccess/.idea/modules.xml | 9 -- .../classModifiers/decAccess/DecAccess.iml | 12 --- .../classModifiers/dropAbstract.log | 2 +- .../dropAbstract/.idea/misc.xml | 73 --------------- .../dropAbstract/.idea/modules.xml | 9 -- .../dropAbstract/dropAbstract.iml | 12 --- .../removeStatic/.idea/misc.xml | 73 --------------- .../removeStatic/.idea/modules.xml | 9 -- .../removeStatic/RemoveStatic.iml | 12 --- .../classModifiers/setAbstract/.idea/misc.xml | 70 --------------- .../setAbstract/.idea/modules.xml | 9 -- .../setAbstract/SetAbstract.iml | 12 --- .../classModifiers/setFinal/.idea/misc.xml | 70 --------------- .../classModifiers/setFinal/.idea/modules.xml | 9 -- .../classModifiers/setFinal/SetFinal.iml | 12 --- .../classModifiers/setFinal1/.idea/misc.xml | 70 --------------- .../setFinal1/.idea/modules.xml | 9 -- .../classModifiers/setFinal1/SetFinal1.iml | 12 --- .../classProperties/addExtends/.idea/misc.xml | 70 --------------- .../addExtends/.idea/modules.xml | 9 -- .../classProperties/addExtends/AddExtends.iml | 12 --- .../addImplements/.idea/misc.xml | 70 --------------- .../addImplements/.idea/modules.xml | 9 -- .../addImplements/AddImplements.iml | 12 --- .../changeExtends/.idea/misc.xml | 70 --------------- .../changeExtends/.idea/modules.xml | 9 -- .../changeExtends/ChangeExtends.iml | 12 --- .../changeExtends2/.idea/misc.xml | 23 ----- .../changeExtends2/.idea/modules.xml | 9 -- .../changeExtends2/ChangeExtends2.iml | 12 --- .../removeExtends/.idea/misc.xml | 70 --------------- .../removeExtends/.idea/modules.xml | 9 -- .../removeExtends/RemoveExtends.iml | 12 --- .../removeImplements/.idea/misc.xml | 70 --------------- .../removeImplements/.idea/modules.xml | 9 -- .../removeImplements/RemoveImplements.iml | 12 --- .../removeImplements2/.idea/misc.xml | 70 --------------- .../removeImplements2/.idea/modules.xml | 9 -- .../removeImplements2/RemoveImplements2.iml | 12 --- .../removeImplements3/.idea/misc.xml | 70 --------------- .../removeImplements3/.idea/modules.xml | 9 -- .../removeImplements3/RemoveImplements3.iml | 12 --- .../incremental/common/addClass/.idea/ant.xml | 7 -- .../common/anonymous/.idea/misc.xml | 70 --------------- .../common/anonymous/.idea/modules.xml | 9 -- .../common/anonymous/Anonymous.iml | 12 --- .../changeDefinitionToClass/.idea/misc.xml | 70 --------------- .../changeDefinitionToClass/.idea/modules.xml | 9 -- .../ChangeDefinitionToClass.iml | 12 --- .../changeDefinitionToClass2/.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeDefinitionToClass2.iml | 12 --- .../common/class2Interface1/.idea/misc.xml | 26 ------ .../common/class2Interface1/.idea/modules.xml | 9 -- .../class2Interface1/Class2Interface1.iml | 12 --- .../common/class2Interface2/.idea/misc.xml | 26 ------ .../common/class2Interface2/.idea/modules.xml | 9 -- .../class2Interface2/Class2Interface2.iml | 12 --- .../common/class2Interface3/.idea/misc.xml | 26 ------ .../common/class2Interface3/.idea/modules.xml | 9 -- .../class2Interface3/Class2Interface3.iml | 12 --- .../common/deleteClass/.idea/misc.xml | 28 ------ .../common/deleteClass/.idea/modules.xml | 9 -- .../common/deleteClass/DeleteClass.iml | 12 --- .../common/deleteClass1/.idea/misc.xml | 70 --------------- .../common/deleteClass1/.idea/modules.xml | 9 -- .../common/deleteClass1/DeleteClass1.iml | 12 --- .../common/deleteClass2/.idea/misc.xml | 70 --------------- .../common/deleteClass2/.idea/modules.xml | 9 -- .../common/deleteClass2/DeleteClass2.iml | 12 --- .../common/deleteClass4/.idea/misc.xml | 7 -- .../common/deleteClass4/.idea/modules.xml | 9 -- .../common/deleteClass4/src/DeleteClass4.iml | 12 --- .../.idea/misc.xml | 28 ------ .../.idea/modules.xml | 9 -- .../DeleteClassPackageDoesntMatchRoot.iml | 12 --- .../common/dependencyUpdate/.idea/misc.xml | 70 --------------- .../common/dependencyUpdate/.idea/modules.xml | 9 -- .../dependencyUpdate/DependencyUpdate.iml | 12 --- .../incremental/common/inner/.idea/misc.xml | 70 --------------- .../common/inner/.idea/modules.xml | 9 -- .../incremental/common/inner/Inner.iml | 12 --- .../common/noResourceDelete/.idea/misc.xml | 70 --------------- .../common/noResourceDelete/.idea/modules.xml | 9 -- .../noResourceDelete/NoResourceDelete.iml | 12 --- .../common/noSecondFileCompile/.idea/misc.xml | 70 --------------- .../noSecondFileCompile/.idea/modules.xml | 9 -- .../NoSecondFileCompile.iml | 12 --- .../noSecondFileCompile1/.idea/misc.xml | 70 --------------- .../noSecondFileCompile1/.idea/modules.xml | 9 -- .../NoSecondFileCompile1.iml | 12 --- .../fieldModifiers/setFinal/.idea/misc.xml | 70 --------------- .../fieldModifiers/setFinal/.idea/modules.xml | 9 -- .../fieldModifiers/setFinal/SetFinal.iml | 12 --- .../fieldModifiers/setPrivate/.idea/misc.xml | 70 --------------- .../setPrivate/.idea/modules.xml | 9 -- .../fieldModifiers/setPrivate/SetPrivate.iml | 12 --- .../setProtected/.idea/misc.xml | 70 --------------- .../setProtected/.idea/modules.xml | 9 -- .../setProtected/SetProtected.iml | 12 --- .../fieldModifiers/setStatic/.idea/misc.xml | 70 --------------- .../setStatic/.idea/modules.xml | 9 -- .../fieldModifiers/setStatic/SetStatic.iml | 12 --- .../fieldModifiers/unsetStatic/.idea/misc.xml | 70 --------------- .../unsetStatic/.idea/modules.xml | 9 -- .../unsetStatic/UnsetStatic.iml | 12 --- .../unsetStaticFinal/.idea/misc.xml | 70 --------------- .../unsetStaticFinal/.idea/modules.xml | 9 -- .../unsetStaticFinal/UnsetStaticFinal.iml | 12 --- .../constantChain/.idea/misc.xml | 70 --------------- .../constantChain/.idea/modules.xml | 9 -- .../constantChain/ConstantChain.iml | 12 --- .../constantChain1/.idea/misc.xml | 70 --------------- .../constantChain1/.idea/modules.xml | 9 -- .../constantChain1/ConstantChain1.iml | 12 --- .../constantChain2/.idea/misc.xml | 70 --------------- .../constantChain2/.idea/modules.xml | 9 -- .../constantChain2/ConstantChain2.iml | 12 --- .../constantRemove/.idea/misc.xml | 70 --------------- .../constantRemove/.idea/modules.xml | 9 -- .../constantRemove/ConstantRemove.iml | 12 --- .../constantRemove1/.idea/misc.xml | 70 --------------- .../constantRemove1/.idea/modules.xml | 9 -- .../constantRemove1/ConstantRemove1.iml | 12 --- .../doubleConstantChange/.idea/misc.xml | 70 --------------- .../doubleConstantChange/.idea/modules.xml | 9 -- .../DoubleConstantChange.iml | 12 --- .../floatConstantChange/.idea/misc.xml | 70 --------------- .../floatConstantChange/.idea/modules.xml | 9 -- .../FloatConstantChange.iml | 12 --- .../innerConstantChange/.idea/misc.xml | 70 --------------- .../innerConstantChange/.idea/modules.xml | 9 -- .../InnerConstantChange.iml | 12 --- .../intConstantChange/.idea/misc.xml | 70 --------------- .../intConstantChange/.idea/modules.xml | 9 -- .../intConstantChange/IntConstantChange.iml | 12 --- .../longConstantChange/.idea/misc.xml | 70 --------------- .../longConstantChange/.idea/modules.xml | 9 -- .../longConstantChange/LongConstantChange.iml | 12 --- .../nonCompileTimeConstant/.idea/misc.xml | 70 --------------- .../nonCompileTimeConstant/.idea/modules.xml | 9 -- .../NonCompileTimeConstant.iml | 12 --- .../fieldProperties/nonIncremental1.log | 4 +- .../nonIncremental1/.idea/misc.xml | 26 ------ .../nonIncremental1/.idea/modules.xml | 9 -- .../nonIncremental1/nonIncremental1.iml | 12 --- .../nonIncremental2/.idea/misc.xml | 87 ------------------ .../nonIncremental2/.idea/modules.xml | 9 -- .../nonIncremental2/NonIncremental2.iml | 12 --- .../fieldProperties/nonIncremental4.log | 2 +- .../nonIncremental4/.idea/misc.xml | 26 ------ .../nonIncremental4/.idea/modules.xml | 9 -- .../nonIncremental4/nonIncremental4.iml | 12 --- .../stringConstantChange/.idea/misc.xml | 70 --------------- .../stringConstantChange/.idea/modules.xml | 9 -- .../StringConstantChange.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../StringConstantLessAccessible.iml | 12 --- .../fieldProperties/typeChange/.idea/misc.xml | 70 --------------- .../typeChange/.idea/modules.xml | 9 -- .../fieldProperties/typeChange/TypeChange.iml | 12 --- .../typeChange1/.idea/misc.xml | 70 --------------- .../typeChange1/.idea/modules.xml | 9 -- .../typeChange1/TypeChange1.iml | 12 --- .../typeChange2/.idea/misc.xml | 70 --------------- .../typeChange2/.idea/modules.xml | 9 -- .../typeChange2/TypeChange2.iml | 12 --- .../generics/addMethodToBase/.idea/misc.xml | 70 --------------- .../addMethodToBase/.idea/modules.xml | 9 -- .../addMethodToBase/AddMethodToBase.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../AddParameterizedMethodToBase.iml | 12 --- .../generics/changeBound/.idea/misc.xml | 70 --------------- .../generics/changeBound/.idea/modules.xml | 9 -- .../generics/changeBound/ChangeBound.iml | 12 --- .../generics/changeBound1/.idea/misc.xml | 70 --------------- .../generics/changeBound1/.idea/modules.xml | 9 -- .../generics/changeBound1/ChangeBound1.iml | 12 --- .../generics/changeBoundClass1/.idea/misc.xml | 70 --------------- .../changeBoundClass1/.idea/modules.xml | 9 -- .../changeBoundClass1/ChangeBoundClass1.iml | 12 --- .../changeBoundInterface1/.idea/misc.xml | 70 --------------- .../changeBoundInterface1/.idea/modules.xml | 9 -- .../ChangeBoundInterface1.iml | 12 --- .../changeBoundedClass/.idea/misc.xml | 70 --------------- .../changeBoundedClass/.idea/modules.xml | 9 -- .../changeBoundedClass/ChangeBoundedClass.iml | 12 --- .../generics/changeExtends/.idea/misc.xml | 70 --------------- .../generics/changeExtends/.idea/modules.xml | 9 -- .../generics/changeExtends/ChangeExtends.iml | 12 --- .../generics/changeExtends1/.idea/misc.xml | 70 --------------- .../generics/changeExtends1/.idea/modules.xml | 9 -- .../changeExtends1/ChangeExtends1.iml | 12 --- .../generics/changeExtends2/.idea/misc.xml | 70 --------------- .../generics/changeExtends2/.idea/modules.xml | 9 -- .../changeExtends2/ChangeExtends2.iml | 12 --- .../generics/changeImplements/.idea/misc.xml | 70 --------------- .../changeImplements/.idea/modules.xml | 9 -- .../changeImplements/ChangeImplements.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeInterfaceTypeParameter.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeToCovariantMethodInBase.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeToCovariantMethodInBase2.iml | 12 --- .../.idea/ant.xml | 7 -- .../.idea/misc.xml | 76 ---------------- .../.idea/modules.xml | 9 -- .../ChangeToCovariantMethodInBase3.iml | 12 --- .../changeVarargSignature/.idea/misc.xml | 70 --------------- .../changeVarargSignature/.idea/modules.xml | 9 -- .../ChangeVarargSignature.iml | 12 --- .../changeVarargSignature1/.idea/misc.xml | 70 --------------- .../changeVarargSignature1/.idea/modules.xml | 9 -- .../ChangeVarargSignature1.iml | 12 --- .../generics/covariance/.idea/misc.xml | 70 --------------- .../generics/covariance/.idea/modules.xml | 9 -- .../generics/covariance/Covariance.iml | 12 --- .../generics/covariance1/.idea/misc.xml | 70 --------------- .../generics/covariance1/.idea/modules.xml | 9 -- .../generics/covariance1/Covariance1.iml | 12 --- .../generics/covariance2/.idea/misc.xml | 70 --------------- .../generics/covariance2/.idea/modules.xml | 9 -- .../generics/covariance2/Covariance2.iml | 12 --- .../covarianceNoChanges/.idea/misc.xml | 70 --------------- .../covarianceNoChanges/.idea/modules.xml | 9 -- .../CovarianceNoChanges.iml | 12 --- .../generics/degenerify/.idea/misc.xml | 70 --------------- .../generics/degenerify/.idea/modules.xml | 9 -- .../generics/degenerify/Degenerify.iml | 12 --- .../generics/degenerify1/.idea/misc.xml | 70 --------------- .../generics/degenerify1/.idea/modules.xml | 9 -- .../generics/degenerify1/Degenerify1.iml | 12 --- .../generics/fieldTypeChange/.idea/misc.xml | 70 --------------- .../fieldTypeChange/.idea/modules.xml | 9 -- .../fieldTypeChange/FieldTypeChange.iml | 12 --- .../overrideAnnotatedAnonymous/.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../OverrideAnnotatedAnonymous.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- ...OverrideAnnotatedAnonymousNotRecompile.iml | 12 --- .../overrideAnnotatedInner/.idea/misc.xml | 70 --------------- .../overrideAnnotatedInner/.idea/modules.xml | 9 -- .../OverrideAnnotatedInner.iml | 12 --- .../generics/paramTypes/.idea/misc.xml | 70 --------------- .../generics/paramTypes/.idea/modules.xml | 9 -- .../generics/paramTypes/ParamTypes.iml | 12 --- .../generics/returnType/.idea/misc.xml | 70 --------------- .../generics/returnType/.idea/modules.xml | 9 -- .../generics/returnType/ReturnType.iml | 12 --- .../imports/classImport/.idea/misc.xml | 23 ----- .../imports/classImport/.idea/modules.xml | 9 -- .../imports/classImport/ClassImport.iml | 12 --- .../imports/staticImport/.idea/misc.xml | 26 ------ .../imports/staticImport/.idea/modules.xml | 9 -- .../imports/staticImport/StaticImport.iml | 12 --- .../addAbstractMethod/.idea/misc.xml | 70 --------------- .../addAbstractMethod/.idea/modules.xml | 9 -- .../addAbstractMethod/AddAbstractMethod.iml | 12 --- .../addConstructorParameter/.idea/misc.xml | 70 --------------- .../addConstructorParameter/.idea/modules.xml | 9 -- .../AddConstructorParameter.iml | 12 --- .../addFieldToBaseClass/.idea/misc.xml | 70 --------------- .../addFieldToBaseClass/.idea/modules.xml | 9 -- .../AddFieldToBaseClass.iml | 12 --- .../addFieldToDerived/.idea/misc.xml | 70 --------------- .../addFieldToDerived/.idea/modules.xml | 9 -- .../addFieldToDerived/AddFieldToDerived.iml | 12 --- .../addFieldToInterface/.idea/misc.xml | 70 --------------- .../addFieldToInterface/.idea/modules.xml | 9 -- .../AddFieldToInterface.iml | 12 --- .../addFieldToInterface2/.idea/misc.xml | 70 --------------- .../addFieldToInterface2/.idea/modules.xml | 9 -- .../AddFieldToInterface2.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- ...alMethodHavingNonFinalMethodInSubclass.iml | 12 --- .../addHidingField/.idea/misc.xml | 70 --------------- .../addHidingField/.idea/modules.xml | 9 -- .../addHidingField/AddHidingField.iml | 12 --- .../addHidingMethod/.idea/misc.xml | 70 --------------- .../addHidingMethod/.idea/modules.xml | 9 -- .../addHidingMethod/AddHidingMethod.iml | 12 --- .../addInterfaceMethod/.idea/misc.xml | 70 --------------- .../addInterfaceMethod/.idea/modules.xml | 9 -- .../addInterfaceMethod/AddInterfaceMethod.iml | 12 --- .../addInterfaceMethod2/.idea/misc.xml | 70 --------------- .../addInterfaceMethod2/.idea/modules.xml | 9 -- .../AddInterfaceMethod2.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../AddLessAccessibleFieldToDerived.iml | 12 --- .../incremental/membersChange/addMethod.log | 4 +- .../membersChange/addMethod/.idea/misc.xml | 90 ------------------- .../membersChange/addMethod/.idea/modules.xml | 9 -- .../membersChange/addMethod/addMethod.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../AddMethodWithCovariantReturnType.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../AddMethodWithIncompatibleReturnType.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../AddMoreAccessibleMethodToBase.iml | 12 --- .../addMoreSpecific/.idea/misc.xml | 70 --------------- .../addMoreSpecific/.idea/modules.xml | 9 -- .../addMoreSpecific/AddMoreSpecific.iml | 12 --- .../addMoreSpecific1/.idea/misc.xml | 70 --------------- .../addMoreSpecific1/.idea/modules.xml | 9 -- .../addMoreSpecific1/AddMoreSpecific1.iml | 12 --- .../addMoreSpecific2/.idea/misc.xml | 70 --------------- .../addMoreSpecific2/.idea/modules.xml | 9 -- .../addMoreSpecific2/AddMoreSpecific2.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- ...aticMethodHavingStaticMethodInSubclass.iml | 12 --- .../addStaticFieldToDerived/.idea/misc.xml | 70 --------------- .../addStaticFieldToDerived/.idea/modules.xml | 9 -- .../AddStaticFieldToDerived.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeMethodGenericReturnType.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ChangeStaticMethodSignature.iml | 12 --- .../deleteConstructor/.idea/misc.xml | 70 --------------- .../deleteConstructor/.idea/modules.xml | 9 -- .../deleteConstructor/DeleteConstructor.iml | 12 --- .../membersChange/deleteInner/.idea/misc.xml | 70 --------------- .../deleteInner/.idea/modules.xml | 9 -- .../membersChange/deleteInner/DeleteInner.iml | 12 --- .../deleteInterfaceMethod/.idea/misc.xml | 70 --------------- .../deleteInterfaceMethod/.idea/modules.xml | 9 -- .../DeleteInterfaceMethod.iml | 12 --- .../membersChange/deleteMethod/.idea/misc.xml | 70 --------------- .../deleteMethod/.idea/modules.xml | 9 -- .../deleteMethod/DeleteMethod.iml | 12 --- .../deleteMethodImplementation/.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../DeleteMethodImplementation.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../DeleteMethodImplementation2.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../DeleteMethodImplementation3.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../DeleteMethodImplementation4.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../DeleteMethodImplementation5.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../DeleteMethodImplementation6.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../DeleteMethodImplementation7.iml | 12 --- .../membersChange/hierarchy/.idea/misc.xml | 70 --------------- .../membersChange/hierarchy/.idea/modules.xml | 9 -- .../membersChange/hierarchy/Hierarchy.iml | 12 --- .../membersChange/hierarchy2/.idea/misc.xml | 70 --------------- .../hierarchy2/.idea/modules.xml | 9 -- .../membersChange/hierarchy2/Hierarchy2.iml | 12 --- .../removeBaseImplementation/.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../RemoveBaseImplementation.iml | 12 --- .../removeHidingField/.idea/misc.xml | 70 --------------- .../removeHidingField/.idea/modules.xml | 9 -- .../removeHidingField/RemoveHidingField.iml | 12 --- .../removeHidingMethod/.idea/misc.xml | 70 --------------- .../removeHidingMethod/.idea/modules.xml | 9 -- .../removeHidingMethod/RemoveHidingMethod.iml | 12 --- .../membersChange/renameMethod/.idea/misc.xml | 70 --------------- .../renameMethod/.idea/modules.xml | 9 -- .../renameMethod/RenameMethod.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../ThrowsListDiffersInBaseAndDerived.iml | 12 --- .../decConstructorAccess/.idea/misc.xml | 70 --------------- .../decConstructorAccess/.idea/modules.xml | 9 -- .../DecConstructorAccess.iml | 12 --- .../methodModifiers/incAccess/.idea/misc.xml | 70 --------------- .../incAccess/.idea/modules.xml | 9 -- .../methodModifiers/incAccess/IncAccess.iml | 12 --- .../setAbstract/.idea/misc.xml | 70 --------------- .../setAbstract/.idea/modules.xml | 9 -- .../setAbstract/SetAbstract.iml | 12 --- .../methodModifiers/setFinal/.idea/misc.xml | 70 --------------- .../setFinal/.idea/modules.xml | 9 -- .../methodModifiers/setFinal/SetFinal.iml | 12 --- .../methodModifiers/setPrivate/.idea/misc.xml | 70 --------------- .../setPrivate/.idea/modules.xml | 9 -- .../methodModifiers/setPrivate/SetPrivate.iml | 12 --- .../setProtected/.idea/misc.xml | 70 --------------- .../setProtected/.idea/modules.xml | 9 -- .../setProtected/SetProtected.iml | 12 --- .../methodModifiers/setStatic/.idea/misc.xml | 70 --------------- .../setStatic/.idea/modules.xml | 9 -- .../methodModifiers/setStatic/SetStatic.iml | 12 --- .../methodModifiers/unsetFinal/.idea/misc.xml | 70 --------------- .../unsetFinal/.idea/modules.xml | 9 -- .../methodModifiers/unsetFinal/UnsetFinal.iml | 12 --- .../unsetStatic/.idea/misc.xml | 70 --------------- .../unsetStatic/.idea/modules.xml | 9 -- .../unsetStatic/UnsetStatic.iml | 12 --- .../methodProperties/addThrows/.idea/misc.xml | 70 --------------- .../addThrows/.idea/modules.xml | 9 -- .../methodProperties/addThrows/AddThrows.iml | 12 --- .../changeReturnType/.idea/misc.xml | 70 --------------- .../changeReturnType/.idea/modules.xml | 9 -- .../changeReturnType/ChangeReturnType.iml | 12 --- .../changeReturnType1/.idea/misc.xml | 70 --------------- .../changeReturnType1/.idea/modules.xml | 9 -- .../changeReturnType1/ChangeReturnType1.iml | 12 --- .../changeSignature/.idea/misc.xml | 70 --------------- .../changeSignature/.idea/modules.xml | 9 -- .../changeSignature/ChangeSignature.iml | 12 --- .../changeSignature1/.idea/misc.xml | 70 --------------- .../changeSignature1/.idea/modules.xml | 9 -- .../changeSignature1/ChangeSignature1.iml | 12 --- .../packageInfoNoRecompile/.idea/misc.xml | 70 --------------- .../packageInfoNoRecompile/.idea/modules.xml | 9 -- .../PackageInfoNoRecompile.iml | 12 --- .../packageInfoNoRecompile2/.idea/misc.xml | 70 --------------- .../packageInfoNoRecompile2/.idea/modules.xml | 9 -- .../PackageInfoNoRecompile2.iml | 12 --- .../.idea/misc.xml | 70 --------------- .../.idea/modules.xml | 9 -- .../PackageInfoRecompileOnConstantChange.iml | 12 --- 506 files changed, 8 insertions(+), 14568 deletions(-) delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/AddAnnotationTarget.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/AddAnnotationTypeMemberWithDefaultValue.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/AddAnnotationTypeMemberWithDefaultValue2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/AddAnnotationTypeMemberWithoutDefaultValue.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/AddDefaultToAnnotationMember.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/ChangeAnnotationRetentionPolicy.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/ChangeAnnotationRetentionPolicy1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/ChangeAnnotationRetentionPolicy2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/ChangeAnnotationRetentionPolicy3.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/ChangeAnnotationRetentionPolicy4.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/ChangeAnnotationTypeMemberType.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/ant.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/classAsArgument.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/ant.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/ant.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/MetaAnnotationChanged.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/MetaAnnotationChangedCascade.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/MetaAnnotationChangedCascade2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/RemoveAnnotationTarget.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/RemoveAnnotationTypeMember.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/RemoveAnnotationTypeMember1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/RemoveDefaultFromAnnotationMember.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/changeName/changeClassName/ChangeClassName.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/ant.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/AddStatic.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/DecAccess.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/dropAbstract.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/RemoveStatic.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/SetAbstract.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/SetFinal.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/SetFinal1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/addExtends/AddExtends.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/addImplements/AddImplements.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/ChangeExtends.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/ChangeExtends2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/RemoveExtends.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/RemoveImplements.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/RemoveImplements2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/RemoveImplements3.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/addClass/.idea/ant.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/anonymous/Anonymous.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/ChangeDefinitionToClass.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/ChangeDefinitionToClass2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface1/Class2Interface1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface2/Class2Interface2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/class2Interface3/Class2Interface3.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass/DeleteClass.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass1/DeleteClass1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass2/DeleteClass2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClass4/src/DeleteClass4.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/DeleteClassPackageDoesntMatchRoot.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/DependencyUpdate.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/inner/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/inner/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/inner/Inner.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noResourceDelete/NoResourceDelete.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/NoSecondFileCompile.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/NoSecondFileCompile1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/SetFinal.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/SetPrivate.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/SetProtected.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/SetStatic.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/UnsetStatic.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/UnsetStaticFinal.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/ConstantChain.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/ConstantChain1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/ConstantChain2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/ConstantRemove.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/ConstantRemove1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/DoubleConstantChange.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/FloatConstantChange.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/InnerConstantChange.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/IntConstantChange.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/LongConstantChange.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/NonCompileTimeConstant.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/NonIncremental2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/nonIncremental4.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/StringConstantChange.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/StringConstantLessAccessible.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/TypeChange.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/TypeChange1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/TypeChange2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/AddMethodToBase.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/AddParameterizedMethodToBase.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBound/ChangeBound.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBound1/ChangeBound1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/ChangeBoundClass1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/ChangeBoundInterface1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/ChangeBoundedClass.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends/ChangeExtends.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends1/ChangeExtends1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeExtends2/ChangeExtends2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeImplements/ChangeImplements.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/ChangeInterfaceTypeParameter.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/ChangeToCovariantMethodInBase.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/ChangeToCovariantMethodInBase2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/ChangeToCovariantMethodInBase3.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/ChangeVarargSignature.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/ChangeVarargSignature1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance/Covariance.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance1/Covariance1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covariance2/Covariance2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/CovarianceNoChanges.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/degenerify/Degenerify.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/degenerify1/Degenerify1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/FieldTypeChange.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/OverrideAnnotatedAnonymous.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/OverrideAnnotatedAnonymousNotRecompile.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/OverrideAnnotatedInner.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/paramTypes/ParamTypes.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/generics/returnType/ReturnType.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/imports/classImport/ClassImport.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/imports/staticImport/StaticImport.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/AddAbstractMethod.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/AddConstructorParameter.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/AddFieldToBaseClass.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/AddFieldToDerived.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/AddFieldToInterface.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/AddFieldToInterface2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/AddFinalMethodHavingNonFinalMethodInSubclass.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/AddHidingField.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/AddHidingMethod.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/AddInterfaceMethod.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/AddInterfaceMethod2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/AddLessAccessibleFieldToDerived.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethod/addMethod.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/AddMethodWithCovariantReturnType.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/AddMethodWithIncompatibleReturnType.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/AddMoreAccessibleMethodToBase.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/AddMoreSpecific.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/AddMoreSpecific1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/AddMoreSpecific2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/AddNonStaticMethodHavingStaticMethodInSubclass.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/AddStaticFieldToDerived.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/ChangeMethodGenericReturnType.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/ChangeStaticMethodSignature.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/DeleteConstructor.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/DeleteInner.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/DeleteInterfaceMethod.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/DeleteMethod.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/DeleteMethodImplementation.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/DeleteMethodImplementation2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/DeleteMethodImplementation3.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/DeleteMethodImplementation4.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/DeleteMethodImplementation5.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/DeleteMethodImplementation6.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/DeleteMethodImplementation7.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/Hierarchy.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/Hierarchy2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/RemoveBaseImplementation.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/RemoveHidingField.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/RemoveHidingMethod.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/RenameMethod.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/ThrowsListDiffersInBaseAndDerived.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/DecConstructorAccess.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/IncAccess.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/SetAbstract.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/SetFinal.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/SetPrivate.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/SetProtected.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/SetStatic.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/UnsetFinal.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/UnsetStatic.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/AddThrows.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/ChangeReturnType.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/ChangeReturnType1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/ChangeSignature.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/ChangeSignature1.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/PackageInfoNoRecompile.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/PackageInfoNoRecompile2.iml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/misc.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/modules.xml delete mode 100644 java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/PackageInfoRecompileOnConstantChange.iml diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/modules.xml deleted file mode 100644 index 87a1decaeab3..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/AddAnnotationTarget.iml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/AddAnnotationTarget.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTarget/AddAnnotationTarget.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/modules.xml deleted file mode 100644 index 8f03fc91f83e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/AddAnnotationTypeMemberWithDefaultValue.iml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/AddAnnotationTypeMemberWithDefaultValue.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue/AddAnnotationTypeMemberWithDefaultValue.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/modules.xml deleted file mode 100644 index 4d2353425ca3..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/AddAnnotationTypeMemberWithDefaultValue2.iml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/AddAnnotationTypeMemberWithDefaultValue2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithDefaultValue2/AddAnnotationTypeMemberWithDefaultValue2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/modules.xml deleted file mode 100644 index bf4d0b3bcdea..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/AddAnnotationTypeMemberWithoutDefaultValue.iml b/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/AddAnnotationTypeMemberWithoutDefaultValue.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addAnnotationTypeMemberWithoutDefaultValue/AddAnnotationTypeMemberWithoutDefaultValue.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/modules.xml deleted file mode 100644 index 677eb05d5c59..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/AddDefaultToAnnotationMember.iml b/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/AddDefaultToAnnotationMember.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/addDefaultToAnnotationMember/AddDefaultToAnnotationMember.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/modules.xml deleted file mode 100644 index b6829d8be29e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/ChangeAnnotationRetentionPolicy.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/ChangeAnnotationRetentionPolicy.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy/ChangeAnnotationRetentionPolicy.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/modules.xml deleted file mode 100644 index acafc31e372b..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/ChangeAnnotationRetentionPolicy1.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/ChangeAnnotationRetentionPolicy1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy1/ChangeAnnotationRetentionPolicy1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/modules.xml deleted file mode 100644 index 36ff464a4d6a..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/ChangeAnnotationRetentionPolicy2.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/ChangeAnnotationRetentionPolicy2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy2/ChangeAnnotationRetentionPolicy2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/modules.xml deleted file mode 100644 index 13ec046fdcd9..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/ChangeAnnotationRetentionPolicy3.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/ChangeAnnotationRetentionPolicy3.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy3/ChangeAnnotationRetentionPolicy3.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/modules.xml deleted file mode 100644 index 7735db9a8f6e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/ChangeAnnotationRetentionPolicy4.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/ChangeAnnotationRetentionPolicy4.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationRetentionPolicy4/ChangeAnnotationRetentionPolicy4.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/modules.xml deleted file mode 100644 index 9dec96470c96..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/ChangeAnnotationTypeMemberType.iml b/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/ChangeAnnotationTypeMemberType.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/changeAnnotationTypeMemberType/ChangeAnnotationTypeMemberType.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument.log b/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument.log index a4e99b222775..712254231412 100644 --- a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument.log +++ b/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/classAsArgument/A.class +out/production/ClassAsArgument/A.class End of files Compiling files: src/A.java End of files Cleaning output files: -out/production/classAsArgument/Annotated.class +out/production/ClassAsArgument/Annotated.class End of files Compiling files: src/Annotated.java diff --git a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/ant.xml b/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/ant.xml deleted file mode 100644 index 2581ca3fe84c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/ant.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/misc.xml deleted file mode 100644 index 492d8ee45ce4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - IDEA jdk - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/modules.xml deleted file mode 100644 index c4d3af7bae81..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/classAsArgument.iml b/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/classAsArgument.iml deleted file mode 100644 index 60a321a1ac4d..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/classAsArgument/classAsArgument.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/ant.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/ant.xml deleted file mode 100644 index 2581ca3fe84c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/.idea/ant.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/ant.xml b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/ant.xml deleted file mode 100644 index 2581ca3fe84c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/.idea/ant.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/modules.xml deleted file mode 100644 index 92da933d3e35..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/MetaAnnotationChanged.iml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/MetaAnnotationChanged.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChanged/MetaAnnotationChanged.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/modules.xml deleted file mode 100644 index f154b0bffd4d..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/MetaAnnotationChangedCascade.iml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/MetaAnnotationChangedCascade.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade/MetaAnnotationChangedCascade.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/modules.xml deleted file mode 100644 index 898a9038c496..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/MetaAnnotationChangedCascade2.iml b/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/MetaAnnotationChangedCascade2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/metaAnnotationChangedCascade2/MetaAnnotationChangedCascade2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/modules.xml deleted file mode 100644 index 4f03ceff3cd6..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/RemoveAnnotationTarget.iml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/RemoveAnnotationTarget.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTarget/RemoveAnnotationTarget.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/modules.xml deleted file mode 100644 index fd4f27c791ec..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/RemoveAnnotationTypeMember.iml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/RemoveAnnotationTypeMember.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember/RemoveAnnotationTypeMember.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/modules.xml deleted file mode 100644 index ca9de21ed3f3..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/RemoveAnnotationTypeMember1.iml b/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/RemoveAnnotationTypeMember1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeAnnotationTypeMember1/RemoveAnnotationTypeMember1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/modules.xml deleted file mode 100644 index a272247b339b..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/RemoveDefaultFromAnnotationMember.iml b/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/RemoveDefaultFromAnnotationMember.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/annotations/removeDefaultFromAnnotationMember/RemoveDefaultFromAnnotationMember.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/modules.xml deleted file mode 100644 index d4676b9e5d79..000000000000 --- a/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/ChangeClassName.iml b/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/ChangeClassName.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/changeName/changeClassName/ChangeClassName.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/ant.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/ant.xml deleted file mode 100644 index 2581ca3fe84c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/ant.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/misc.xml deleted file mode 100644 index 8f9b6774e56c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/misc.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/modules.xml deleted file mode 100644 index 687eb791ce0a..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/AddStatic.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/AddStatic.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/addStatic/AddStatic.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/modules.xml deleted file mode 100644 index e1e2e73775ed..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/DecAccess.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/DecAccess.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/DecAccess.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract.log b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract.log index d473eadc2478..5d2b302d3597 100644 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract.log +++ b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/dropAbstract/A.class +out/production/DropAbstract/A.class End of files Compiling files: src/A.java diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/misc.xml deleted file mode 100644 index 8f9b6774e56c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/misc.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/modules.xml deleted file mode 100644 index 420da739bbe6..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/dropAbstract.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/dropAbstract.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/dropAbstract/dropAbstract.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/misc.xml deleted file mode 100644 index 8f9b6774e56c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/misc.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/modules.xml deleted file mode 100644 index ad8f9d9188f8..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/RemoveStatic.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/RemoveStatic.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/removeStatic/RemoveStatic.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/modules.xml deleted file mode 100644 index 0e74d9bcb73c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/SetAbstract.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/SetAbstract.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setAbstract/SetAbstract.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/modules.xml deleted file mode 100644 index 665166a9762e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/SetFinal.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/SetFinal.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal/SetFinal.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/modules.xml deleted file mode 100644 index 222152313626..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/SetFinal1.iml b/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/SetFinal1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classModifiers/setFinal1/SetFinal1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/modules.xml deleted file mode 100644 index 791405a3316f..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/AddExtends.iml b/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/AddExtends.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/addExtends/AddExtends.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/modules.xml deleted file mode 100644 index e6ea70b571bd..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/AddImplements.iml b/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/AddImplements.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/addImplements/AddImplements.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/modules.xml deleted file mode 100644 index 7e67b29b33a7..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/ChangeExtends.iml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/ChangeExtends.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends/ChangeExtends.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/misc.xml deleted file mode 100644 index 3be55a8062da..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/misc.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - IDEA jdk - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/modules.xml deleted file mode 100644 index 4f270de54f78..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/ChangeExtends2.iml b/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/ChangeExtends2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/changeExtends2/ChangeExtends2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/modules.xml deleted file mode 100644 index c4361a1d9a37..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/RemoveExtends.iml b/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/RemoveExtends.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeExtends/RemoveExtends.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/modules.xml deleted file mode 100644 index b5482566c673..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/RemoveImplements.iml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/RemoveImplements.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements/RemoveImplements.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/modules.xml deleted file mode 100644 index 13c4de279d3f..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/RemoveImplements2.iml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/RemoveImplements2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements2/RemoveImplements2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/modules.xml deleted file mode 100644 index b2a0be8fc4cf..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/RemoveImplements3.iml b/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/RemoveImplements3.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/classProperties/removeImplements3/RemoveImplements3.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/addClass/.idea/ant.xml b/java/java-tests/testData/compileServer/incremental/common/addClass/.idea/ant.xml deleted file mode 100644 index 2581ca3fe84c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/addClass/.idea/ant.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/modules.xml deleted file mode 100644 index 6ba57f3dba40..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/anonymous/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/anonymous/Anonymous.iml b/java/java-tests/testData/compileServer/incremental/common/anonymous/Anonymous.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/anonymous/Anonymous.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/modules.xml deleted file mode 100644 index ce55df2203f7..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/ChangeDefinitionToClass.iml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/ChangeDefinitionToClass.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass/ChangeDefinitionToClass.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/modules.xml deleted file mode 100644 index 038246ac25d0..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/ChangeDefinitionToClass2.iml b/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/ChangeDefinitionToClass2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/changeDefinitionToClass2/ChangeDefinitionToClass2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/misc.xml deleted file mode 100644 index 492d8ee45ce4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - IDEA jdk - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/modules.xml deleted file mode 100644 index f4e0bd4714d1..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/Class2Interface1.iml b/java/java-tests/testData/compileServer/incremental/common/class2Interface1/Class2Interface1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface1/Class2Interface1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/misc.xml deleted file mode 100644 index 492d8ee45ce4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - IDEA jdk - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/modules.xml deleted file mode 100644 index 793ab142bd2d..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/Class2Interface2.iml b/java/java-tests/testData/compileServer/incremental/common/class2Interface2/Class2Interface2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface2/Class2Interface2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/misc.xml deleted file mode 100644 index 492d8ee45ce4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - IDEA jdk - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/modules.xml deleted file mode 100644 index 44227960c698..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/Class2Interface3.iml b/java/java-tests/testData/compileServer/incremental/common/class2Interface3/Class2Interface3.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/class2Interface3/Class2Interface3.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/misc.xml deleted file mode 100644 index 003e235f0e55..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/misc.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/modules.xml deleted file mode 100644 index cfce0320b23c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass/DeleteClass.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClass/DeleteClass.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass/DeleteClass.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/modules.xml deleted file mode 100644 index ab3d957c74e2..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/DeleteClass1.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/DeleteClass1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/DeleteClass1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/modules.xml deleted file mode 100644 index e3cd55186af4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/DeleteClass2.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/DeleteClass2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/DeleteClass2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/misc.xml deleted file mode 100644 index 009e85484d08..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/modules.xml deleted file mode 100644 index 50612c217c0f..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass4/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass4/src/DeleteClass4.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClass4/src/DeleteClass4.iml deleted file mode 100644 index b6f444bc3557..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClass4/src/DeleteClass4.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/misc.xml deleted file mode 100644 index 003e235f0e55..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/misc.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/modules.xml deleted file mode 100644 index 934bf2237711..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/DeleteClassPackageDoesntMatchRoot.iml b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/DeleteClassPackageDoesntMatchRoot.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/DeleteClassPackageDoesntMatchRoot.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/modules.xml deleted file mode 100644 index 8525221665f5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/DependencyUpdate.iml b/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/DependencyUpdate.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/dependencyUpdate/DependencyUpdate.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/inner/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/inner/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/inner/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/inner/.idea/modules.xml deleted file mode 100644 index fa5076f71fe0..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/inner/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/inner/Inner.iml b/java/java-tests/testData/compileServer/incremental/common/inner/Inner.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/inner/Inner.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/modules.xml deleted file mode 100644 index a7f907fb6241..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/NoResourceDelete.iml b/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/NoResourceDelete.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noResourceDelete/NoResourceDelete.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/modules.xml deleted file mode 100644 index ad3eee0440da..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/NoSecondFileCompile.iml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/NoSecondFileCompile.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile/NoSecondFileCompile.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/modules.xml deleted file mode 100644 index 3c5e78cb4111..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/NoSecondFileCompile1.iml b/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/NoSecondFileCompile1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/common/noSecondFileCompile1/NoSecondFileCompile1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/modules.xml deleted file mode 100644 index 665166a9762e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/SetFinal.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/SetFinal.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setFinal/SetFinal.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/modules.xml deleted file mode 100644 index dca1383138f6..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/SetPrivate.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/SetPrivate.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setPrivate/SetPrivate.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/modules.xml deleted file mode 100644 index d66030fcece2..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/SetProtected.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/SetProtected.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setProtected/SetProtected.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/modules.xml deleted file mode 100644 index 4111b4dab208..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/SetStatic.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/SetStatic.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/setStatic/SetStatic.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/modules.xml deleted file mode 100644 index 605070524f01..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/UnsetStatic.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/UnsetStatic.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStatic/UnsetStatic.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/modules.xml deleted file mode 100644 index 73d9f1f13dc5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/UnsetStaticFinal.iml b/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/UnsetStaticFinal.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldModifiers/unsetStaticFinal/UnsetStaticFinal.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/modules.xml deleted file mode 100644 index 3f97110c4180..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/ConstantChain.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/ConstantChain.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain/ConstantChain.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/modules.xml deleted file mode 100644 index b2fd401a6ef7..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/ConstantChain1.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/ConstantChain1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain1/ConstantChain1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/modules.xml deleted file mode 100644 index 271f48ccd84e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/ConstantChain2.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/ConstantChain2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantChain2/ConstantChain2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/modules.xml deleted file mode 100644 index 8ba916f725ac..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/ConstantRemove.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/ConstantRemove.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove/ConstantRemove.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/modules.xml deleted file mode 100644 index a13f6b45420e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/ConstantRemove1.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/ConstantRemove1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/constantRemove1/ConstantRemove1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/modules.xml deleted file mode 100644 index 9af01a2857ed..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/DoubleConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/DoubleConstantChange.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/doubleConstantChange/DoubleConstantChange.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/modules.xml deleted file mode 100644 index 37dd82c75395..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/FloatConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/FloatConstantChange.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/floatConstantChange/FloatConstantChange.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/modules.xml deleted file mode 100644 index 9cef50122ff4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/InnerConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/InnerConstantChange.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/innerConstantChange/InnerConstantChange.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/modules.xml deleted file mode 100644 index 6439de22e9cc..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/IntConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/IntConstantChange.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/intConstantChange/IntConstantChange.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/modules.xml deleted file mode 100644 index f842d677f842..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/LongConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/LongConstantChange.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/longConstantChange/LongConstantChange.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/modules.xml deleted file mode 100644 index 7b182cab6bb4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/NonCompileTimeConstant.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/NonCompileTimeConstant.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonCompileTimeConstant/NonCompileTimeConstant.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1.log index b32437465961..16ed744fb632 100644 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1.log +++ b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/nonIncremental1/A/A.class +out/production/NonIncremental1/A/A.class End of files Compiling files: src/A/A.java End of files Cleaning output files: -out/production/nonIncremental1/A/C.class +out/production/NonIncremental1/A/C.class End of files Compiling files: src/A/C.java diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/misc.xml deleted file mode 100644 index 83d038f968a4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - 1.6 - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/modules.xml deleted file mode 100644 index e41db5c2de60..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/nonIncremental1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/misc.xml deleted file mode 100644 index 47c32a7a7e1a..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/misc.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/modules.xml deleted file mode 100644 index 9ccf8fb28b95..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/NonIncremental2.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/NonIncremental2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/NonIncremental2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4.log b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4.log index 1271cf07c7f9..c5b0bbf95d33 100644 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4.log +++ b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/nonIncremental4/A.class +out/production/NonIncremental4/A.class End of files Compiling files: src/A.java diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/misc.xml deleted file mode 100644 index 492d8ee45ce4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - IDEA jdk - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/modules.xml deleted file mode 100644 index 5b72606625e5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/nonIncremental4.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/nonIncremental4.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental4/nonIncremental4.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/modules.xml deleted file mode 100644 index 1e3bd790e487..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/StringConstantChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/StringConstantChange.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantChange/StringConstantChange.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/modules.xml deleted file mode 100644 index 321a4e3865dc..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/StringConstantLessAccessible.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/StringConstantLessAccessible.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/stringConstantLessAccessible/StringConstantLessAccessible.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/modules.xml deleted file mode 100644 index f0799d6abcbc..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/TypeChange.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/TypeChange.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange/TypeChange.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/modules.xml deleted file mode 100644 index 558793b88d37..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/TypeChange1.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/TypeChange1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange1/TypeChange1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/modules.xml deleted file mode 100644 index 259a58f366c1..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/TypeChange2.iml b/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/TypeChange2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/fieldProperties/typeChange2/TypeChange2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/modules.xml deleted file mode 100644 index f7b893f3b703..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/AddMethodToBase.iml b/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/AddMethodToBase.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/addMethodToBase/AddMethodToBase.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/modules.xml deleted file mode 100644 index b8b793d8c1ad..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/AddParameterizedMethodToBase.iml b/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/AddParameterizedMethodToBase.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/addParameterizedMethodToBase/AddParameterizedMethodToBase.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/modules.xml deleted file mode 100644 index 109729d3669b..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBound/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBound/ChangeBound.iml b/java/java-tests/testData/compileServer/incremental/generics/changeBound/ChangeBound.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBound/ChangeBound.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/modules.xml deleted file mode 100644 index 3934e48cee32..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBound1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBound1/ChangeBound1.iml b/java/java-tests/testData/compileServer/incremental/generics/changeBound1/ChangeBound1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBound1/ChangeBound1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/modules.xml deleted file mode 100644 index c5ca2d6c90e3..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/ChangeBoundClass1.iml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/ChangeBoundClass1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundClass1/ChangeBoundClass1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/modules.xml deleted file mode 100644 index 68665b284293..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/ChangeBoundInterface1.iml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/ChangeBoundInterface1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundInterface1/ChangeBoundInterface1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/modules.xml deleted file mode 100644 index bd8c8f2c6161..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/ChangeBoundedClass.iml b/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/ChangeBoundedClass.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeBoundedClass/ChangeBoundedClass.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/modules.xml deleted file mode 100644 index 7e67b29b33a7..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends/ChangeExtends.iml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends/ChangeExtends.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends/ChangeExtends.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/modules.xml deleted file mode 100644 index e857d8d2103c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/ChangeExtends1.iml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/ChangeExtends1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends1/ChangeExtends1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/modules.xml deleted file mode 100644 index 4f270de54f78..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/ChangeExtends2.iml b/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/ChangeExtends2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeExtends2/ChangeExtends2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/modules.xml deleted file mode 100644 index 4403964fee77..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeImplements/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeImplements/ChangeImplements.iml b/java/java-tests/testData/compileServer/incremental/generics/changeImplements/ChangeImplements.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeImplements/ChangeImplements.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/modules.xml deleted file mode 100644 index 07aa6bb59078..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/ChangeInterfaceTypeParameter.iml b/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/ChangeInterfaceTypeParameter.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeInterfaceTypeParameter/ChangeInterfaceTypeParameter.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/modules.xml deleted file mode 100644 index c2e4b2ccd46a..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/ChangeToCovariantMethodInBase.iml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/ChangeToCovariantMethodInBase.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/ChangeToCovariantMethodInBase.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/modules.xml deleted file mode 100644 index 0c0e06f96c16..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/ChangeToCovariantMethodInBase2.iml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/ChangeToCovariantMethodInBase2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/ChangeToCovariantMethodInBase2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml deleted file mode 100644 index 2581ca3fe84c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/ant.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/misc.xml deleted file mode 100644 index f756a685860b..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/misc.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - http://www.w3.org/1999/xhtml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/modules.xml deleted file mode 100644 index 8ab5f0ab834b..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/ChangeToCovariantMethodInBase3.iml b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/ChangeToCovariantMethodInBase3.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/ChangeToCovariantMethodInBase3.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/modules.xml deleted file mode 100644 index f7f3001b4a9d..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/ChangeVarargSignature.iml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/ChangeVarargSignature.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/ChangeVarargSignature.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/modules.xml deleted file mode 100644 index 79805265a003..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/ChangeVarargSignature1.iml b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/ChangeVarargSignature1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/ChangeVarargSignature1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/modules.xml deleted file mode 100644 index acde77ce9266..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance/Covariance.iml b/java/java-tests/testData/compileServer/incremental/generics/covariance/Covariance.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance/Covariance.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/modules.xml deleted file mode 100644 index de0bd66805da..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance1/Covariance1.iml b/java/java-tests/testData/compileServer/incremental/generics/covariance1/Covariance1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance1/Covariance1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/modules.xml deleted file mode 100644 index 09358d02830d..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covariance2/Covariance2.iml b/java/java-tests/testData/compileServer/incremental/generics/covariance2/Covariance2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covariance2/Covariance2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/modules.xml deleted file mode 100644 index b1c8af26f80d..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/CovarianceNoChanges.iml b/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/CovarianceNoChanges.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/covarianceNoChanges/CovarianceNoChanges.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/modules.xml deleted file mode 100644 index 553f60821137..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/degenerify/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/degenerify/Degenerify.iml b/java/java-tests/testData/compileServer/incremental/generics/degenerify/Degenerify.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/degenerify/Degenerify.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/modules.xml deleted file mode 100644 index a125429aa792..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/degenerify1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/degenerify1/Degenerify1.iml b/java/java-tests/testData/compileServer/incremental/generics/degenerify1/Degenerify1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/degenerify1/Degenerify1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/modules.xml deleted file mode 100644 index b37922ea7e64..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/FieldTypeChange.iml b/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/FieldTypeChange.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/fieldTypeChange/FieldTypeChange.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/modules.xml deleted file mode 100644 index 31df9437b787..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/OverrideAnnotatedAnonymous.iml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/OverrideAnnotatedAnonymous.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/OverrideAnnotatedAnonymous.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/modules.xml deleted file mode 100644 index b5106a4c8a4e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/OverrideAnnotatedAnonymousNotRecompile.iml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/OverrideAnnotatedAnonymousNotRecompile.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/OverrideAnnotatedAnonymousNotRecompile.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/modules.xml deleted file mode 100644 index 35e76cd687c4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/OverrideAnnotatedInner.iml b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/OverrideAnnotatedInner.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/OverrideAnnotatedInner.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/modules.xml deleted file mode 100644 index 0e675426071d..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/paramTypes/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/paramTypes/ParamTypes.iml b/java/java-tests/testData/compileServer/incremental/generics/paramTypes/ParamTypes.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/paramTypes/ParamTypes.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/modules.xml deleted file mode 100644 index d3b6a742818d..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/returnType/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/generics/returnType/ReturnType.iml b/java/java-tests/testData/compileServer/incremental/generics/returnType/ReturnType.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/generics/returnType/ReturnType.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/misc.xml deleted file mode 100644 index 3be55a8062da..000000000000 --- a/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/misc.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - IDEA jdk - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/modules.xml deleted file mode 100644 index c3631e459281..000000000000 --- a/java/java-tests/testData/compileServer/incremental/imports/classImport/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/imports/classImport/ClassImport.iml b/java/java-tests/testData/compileServer/incremental/imports/classImport/ClassImport.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/imports/classImport/ClassImport.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/misc.xml deleted file mode 100644 index 492d8ee45ce4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/misc.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - IDEA jdk - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/modules.xml deleted file mode 100644 index b392986041df..000000000000 --- a/java/java-tests/testData/compileServer/incremental/imports/staticImport/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/imports/staticImport/StaticImport.iml b/java/java-tests/testData/compileServer/incremental/imports/staticImport/StaticImport.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/imports/staticImport/StaticImport.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/modules.xml deleted file mode 100644 index d1cbbee0f9fc..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/AddAbstractMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/AddAbstractMethod.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/AddAbstractMethod.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/modules.xml deleted file mode 100644 index cfc87eeda357..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/AddConstructorParameter.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/AddConstructorParameter.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addConstructorParameter/AddConstructorParameter.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/modules.xml deleted file mode 100644 index c86b2cbe9d5a..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/AddFieldToBaseClass.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/AddFieldToBaseClass.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToBaseClass/AddFieldToBaseClass.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/modules.xml deleted file mode 100644 index 79b4b1312a13..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/AddFieldToDerived.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/AddFieldToDerived.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToDerived/AddFieldToDerived.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/modules.xml deleted file mode 100644 index 404cd2773ec6..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/AddFieldToInterface.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/AddFieldToInterface.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface/AddFieldToInterface.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/modules.xml deleted file mode 100644 index ea9f70da84f2..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/AddFieldToInterface2.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/AddFieldToInterface2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFieldToInterface2/AddFieldToInterface2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/modules.xml deleted file mode 100644 index 2c4f32e7f152..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/AddFinalMethodHavingNonFinalMethodInSubclass.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/AddFinalMethodHavingNonFinalMethodInSubclass.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addFinalMethodHavingNonFinalMethodInSubclass/AddFinalMethodHavingNonFinalMethodInSubclass.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/modules.xml deleted file mode 100644 index 87b9b72746e0..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/AddHidingField.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/AddHidingField.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingField/AddHidingField.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/modules.xml deleted file mode 100644 index fe2652663dbd..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/AddHidingMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/AddHidingMethod.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addHidingMethod/AddHidingMethod.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/modules.xml deleted file mode 100644 index 9f40a921fc43..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/AddInterfaceMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/AddInterfaceMethod.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod/AddInterfaceMethod.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/modules.xml deleted file mode 100644 index 51be8d8f77f6..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/AddInterfaceMethod2.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/AddInterfaceMethod2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addInterfaceMethod2/AddInterfaceMethod2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/modules.xml deleted file mode 100644 index 48e7c992b6e4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/AddLessAccessibleFieldToDerived.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/AddLessAccessibleFieldToDerived.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addLessAccessibleFieldToDerived/AddLessAccessibleFieldToDerived.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod.log b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod.log index 6029a469da48..316e4be06caa 100644 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod.log +++ b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod.log @@ -1,11 +1,11 @@ Cleaning output files: -out/production/addMethod/A.class +out/production/AddMethod/A.class End of files Compiling files: src/A.java End of files Cleaning output files: -out/production/addMethod/D.class +out/production/AddMethod/D.class End of files Compiling files: src/D.java diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/misc.xml deleted file mode 100644 index fcc08081d3b2..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/misc.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/modules.xml deleted file mode 100644 index 2836f4c1ce80..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/addMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/addMethod.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethod/addMethod.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/modules.xml deleted file mode 100644 index 0f8971827c3b..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/AddMethodWithCovariantReturnType.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/AddMethodWithCovariantReturnType.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithCovariantReturnType/AddMethodWithCovariantReturnType.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/modules.xml deleted file mode 100644 index f6fecefa5bc1..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/AddMethodWithIncompatibleReturnType.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/AddMethodWithIncompatibleReturnType.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMethodWithIncompatibleReturnType/AddMethodWithIncompatibleReturnType.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/modules.xml deleted file mode 100644 index 55f76df80eba..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/AddMoreAccessibleMethodToBase.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/AddMoreAccessibleMethodToBase.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreAccessibleMethodToBase/AddMoreAccessibleMethodToBase.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/modules.xml deleted file mode 100644 index b939c418793c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/AddMoreSpecific.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/AddMoreSpecific.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific/AddMoreSpecific.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/modules.xml deleted file mode 100644 index 1a70c428f961..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/AddMoreSpecific1.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/AddMoreSpecific1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific1/AddMoreSpecific1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/modules.xml deleted file mode 100644 index 852654b05fe7..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/AddMoreSpecific2.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/AddMoreSpecific2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addMoreSpecific2/AddMoreSpecific2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/modules.xml deleted file mode 100644 index 02ef1174fb99..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/AddNonStaticMethodHavingStaticMethodInSubclass.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/AddNonStaticMethodHavingStaticMethodInSubclass.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addNonStaticMethodHavingStaticMethodInSubclass/AddNonStaticMethodHavingStaticMethodInSubclass.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/modules.xml deleted file mode 100644 index 7ce8fbd3a222..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/AddStaticFieldToDerived.iml b/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/AddStaticFieldToDerived.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/addStaticFieldToDerived/AddStaticFieldToDerived.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/modules.xml deleted file mode 100644 index 977c8749481e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/ChangeMethodGenericReturnType.iml b/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/ChangeMethodGenericReturnType.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/ChangeMethodGenericReturnType.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/modules.xml deleted file mode 100644 index 7f6b4c6350d8..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/ChangeStaticMethodSignature.iml b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/ChangeStaticMethodSignature.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/ChangeStaticMethodSignature.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/modules.xml deleted file mode 100644 index e4a821f19a07..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/DeleteConstructor.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/DeleteConstructor.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteConstructor/DeleteConstructor.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/modules.xml deleted file mode 100644 index f617095d8799..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/DeleteInner.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/DeleteInner.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInner/DeleteInner.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/modules.xml deleted file mode 100644 index f0aebe91e4fb..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/DeleteInterfaceMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/DeleteInterfaceMethod.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteInterfaceMethod/DeleteInterfaceMethod.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/modules.xml deleted file mode 100644 index 652c9f10ac59..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/DeleteMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/DeleteMethod.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethod/DeleteMethod.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/modules.xml deleted file mode 100644 index bdc110ce986d..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/DeleteMethodImplementation.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/DeleteMethodImplementation.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation/DeleteMethodImplementation.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/modules.xml deleted file mode 100644 index aa5a7b7491f9..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/DeleteMethodImplementation2.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/DeleteMethodImplementation2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation2/DeleteMethodImplementation2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/modules.xml deleted file mode 100644 index b774f65c0b33..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/DeleteMethodImplementation3.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/DeleteMethodImplementation3.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation3/DeleteMethodImplementation3.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/modules.xml deleted file mode 100644 index 7c4536a5af23..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/DeleteMethodImplementation4.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/DeleteMethodImplementation4.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation4/DeleteMethodImplementation4.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/modules.xml deleted file mode 100644 index 6de256e2a5a8..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/DeleteMethodImplementation5.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/DeleteMethodImplementation5.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation5/DeleteMethodImplementation5.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/modules.xml deleted file mode 100644 index 3b98b92170f4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/DeleteMethodImplementation6.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/DeleteMethodImplementation6.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation6/DeleteMethodImplementation6.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/modules.xml deleted file mode 100644 index ecb3321d9030..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/DeleteMethodImplementation7.iml b/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/DeleteMethodImplementation7.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/deleteMethodImplementation7/DeleteMethodImplementation7.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/modules.xml deleted file mode 100644 index 736c854226b4..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/Hierarchy.iml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/Hierarchy.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy/Hierarchy.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/modules.xml deleted file mode 100644 index d3b808aae48e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/Hierarchy2.iml b/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/Hierarchy2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/hierarchy2/Hierarchy2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/modules.xml deleted file mode 100644 index c0b200561130..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/RemoveBaseImplementation.iml b/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/RemoveBaseImplementation.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeBaseImplementation/RemoveBaseImplementation.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/modules.xml deleted file mode 100644 index d6115eeca779..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/RemoveHidingField.iml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/RemoveHidingField.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingField/RemoveHidingField.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/modules.xml deleted file mode 100644 index e54ee6460cef..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/RemoveHidingMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/RemoveHidingMethod.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/removeHidingMethod/RemoveHidingMethod.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/modules.xml deleted file mode 100644 index 0314a0acf43d..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/RenameMethod.iml b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/RenameMethod.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/RenameMethod.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/modules.xml deleted file mode 100644 index b38d5d5c5282..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/ThrowsListDiffersInBaseAndDerived.iml b/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/ThrowsListDiffersInBaseAndDerived.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/membersChange/throwsListDiffersInBaseAndDerived/ThrowsListDiffersInBaseAndDerived.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/modules.xml deleted file mode 100644 index 4ac12a1ab24f..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/DecConstructorAccess.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/DecConstructorAccess.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/DecConstructorAccess.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/modules.xml deleted file mode 100644 index f2e3bf6d3d83..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/IncAccess.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/IncAccess.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/incAccess/IncAccess.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/modules.xml deleted file mode 100644 index 0e74d9bcb73c..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/SetAbstract.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/SetAbstract.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setAbstract/SetAbstract.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/modules.xml deleted file mode 100644 index 665166a9762e..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/SetFinal.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/SetFinal.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setFinal/SetFinal.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/modules.xml deleted file mode 100644 index dca1383138f6..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/SetPrivate.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/SetPrivate.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setPrivate/SetPrivate.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/modules.xml deleted file mode 100644 index d66030fcece2..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/SetProtected.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/SetProtected.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setProtected/SetProtected.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/modules.xml deleted file mode 100644 index 4111b4dab208..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/SetStatic.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/SetStatic.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/setStatic/SetStatic.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/modules.xml deleted file mode 100644 index a8ea1cd58a7a..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/UnsetFinal.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/UnsetFinal.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetFinal/UnsetFinal.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/modules.xml deleted file mode 100644 index 605070524f01..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/UnsetStatic.iml b/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/UnsetStatic.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodModifiers/unsetStatic/UnsetStatic.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/modules.xml deleted file mode 100644 index 2d0d3c2a4b3b..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/AddThrows.iml b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/AddThrows.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/AddThrows.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/modules.xml deleted file mode 100644 index d6c76d7e40f8..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/ChangeReturnType.iml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/ChangeReturnType.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType/ChangeReturnType.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/modules.xml deleted file mode 100644 index 37b3dd9c77d9..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/ChangeReturnType1.iml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/ChangeReturnType1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeReturnType1/ChangeReturnType1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/modules.xml deleted file mode 100644 index c5ee653e0142..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/ChangeSignature.iml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/ChangeSignature.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature/ChangeSignature.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/modules.xml deleted file mode 100644 index 84549291c90a..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/ChangeSignature1.iml b/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/ChangeSignature1.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/methodProperties/changeSignature1/ChangeSignature1.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/modules.xml deleted file mode 100644 index 090d6d480f37..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/PackageInfoNoRecompile.iml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/PackageInfoNoRecompile.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile/PackageInfoNoRecompile.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/modules.xml deleted file mode 100644 index e57594de4143..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/PackageInfoNoRecompile2.iml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/PackageInfoNoRecompile2.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoNoRecompile2/PackageInfoNoRecompile2.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/misc.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/misc.xml deleted file mode 100644 index f22d96b8c6a5..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/misc.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IDEA jdk - - - - - - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/modules.xml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/modules.xml deleted file mode 100644 index 87a619ebf561..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/.idea/modules.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/PackageInfoRecompileOnConstantChange.iml b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/PackageInfoRecompileOnConstantChange.iml deleted file mode 100644 index d5c074327501..000000000000 --- a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/PackageInfoRecompileOnConstantChange.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - From 4c43aa5a34f8290836838ab47ccbdcc577cbb8ed Mon Sep 17 00:00:00 2001 From: Alexander Doroshko Date: Tue, 21 Aug 2012 13:14:52 +0400 Subject: [PATCH 12/27] narrow down constructor visibility --- .../org/jetbrains/jps/model/impl/JpsElementChildRoleBase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementChildRoleBase.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementChildRoleBase.java index 9ed14bf64214..cf1bbcc0200a 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementChildRoleBase.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsElementChildRoleBase.java @@ -9,7 +9,7 @@ import org.jetbrains.jps.model.JpsElementChildRole; public class JpsElementChildRoleBase extends JpsElementChildRole { private String myDebugName; - public JpsElementChildRoleBase(String debugName) { + protected JpsElementChildRoleBase(String debugName) { myDebugName = debugName; } From e0c40d9498901715fef9bf346143af1d06e30e95 Mon Sep 17 00:00:00 2001 From: Alexander Doroshko Date: Tue, 21 Aug 2012 13:15:52 +0400 Subject: [PATCH 13/27] better param name --- .../jetbrains/jps/model/impl/JpsCompositeElementBase.java | 4 ++-- .../jetbrains/jps/model/library/impl/sdk/JpsSdkImpl.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsCompositeElementBase.java b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsCompositeElementBase.java index 70c6558560ad..9fbf65f7f66f 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsCompositeElementBase.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/impl/JpsCompositeElementBase.java @@ -17,8 +17,8 @@ public abstract class JpsCompositeElementBase extends JpsCompositeElementBase element) { - super.applyChanges(element); - setHomePath(element.getHomePath()); - setVersionString(element.getVersionString()); + public void applyChanges(@NotNull JpsSdkImpl

modified) { + super.applyChanges(modified); + setHomePath(modified.getHomePath()); + setVersionString(modified.getVersionString()); } @Override From 66b97a6fcbdd9613c44f799e34180323edba4720 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 21 Aug 2012 16:56:33 +0200 Subject: [PATCH 14/27] add option ForceSkipIndent to enter handler delegate --- .../intellij/codeInsight/editorActions/EnterHandler.java | 6 +++++- .../editorActions/enter/EnterHandlerDelegate.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java index e288ef1a57c2..b8d3d7146881 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/EnterHandler.java @@ -114,6 +114,7 @@ public class EnterHandler extends BaseEnterHandler { documentManager.commitDocument(document); boolean forceIndent = false; + boolean forceSkipIndent = false; Ref caretOffsetRef = new Ref(caretOffset); Ref caretAdvanceRef = new Ref(0); @@ -131,6 +132,9 @@ public class EnterHandler extends BaseEnterHandler { if (result == EnterHandlerDelegate.Result.DefaultForceIndent) { forceIndent = true; } + else if (result == EnterHandlerDelegate.Result.DefaultSkipIndent) { + forceSkipIndent = true; + } break; } } @@ -142,7 +146,7 @@ public class EnterHandler extends BaseEnterHandler { !isFirstColumn && !(caretOffset >= text.length() || text.charAt(caretOffset) == ' ' || text.charAt(caretOffset) == '\t'); editor.getCaretModel().moveToOffset(caretOffset); myOriginalHandler.execute(editor, dataContext); - if (!editor.isInsertMode()) { + if (!editor.isInsertMode() || forceSkipIndent) { return; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterHandlerDelegate.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterHandlerDelegate.java index a9f6647d5c85..253e34455365 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterHandlerDelegate.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/enter/EnterHandlerDelegate.java @@ -32,7 +32,7 @@ public interface EnterHandlerDelegate { ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.enterHandlerDelegate"); enum Result { - Default, Continue, DefaultForceIndent, Stop + Default, Continue, DefaultForceIndent, DefaultSkipIndent, Stop } Result preprocessEnter(@NotNull final PsiFile file, @NotNull final Editor editor, @NotNull final Ref caretOffset, From d9848db0f4e1244c947b05d133ecb997c95bac24 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Tue, 21 Aug 2012 16:57:04 +0200 Subject: [PATCH 15/27] minor change to JavaCoreProjectEnvironment --- .../src/com/intellij/core/JavaCoreProjectEnvironment.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java b/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java index 25e840058e08..f037f7971cc7 100644 --- a/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java +++ b/java/java-psi-impl/src/com/intellij/core/JavaCoreProjectEnvironment.java @@ -17,7 +17,6 @@ package com.intellij.core; import com.intellij.mock.MockFileIndexFacade; import com.intellij.openapi.Disposable; -import com.intellij.openapi.roots.FileIndexFacade; import com.intellij.openapi.roots.LanguageLevelProjectExtension; import com.intellij.openapi.roots.PackageIndex; import com.intellij.openapi.vfs.VirtualFile; @@ -45,7 +44,7 @@ public class JavaCoreProjectEnvironment extends CoreProjectEnvironment { super(parentDisposable, applicationEnvironment); myProject.registerService(PsiElementFactory.class, new PsiElementFactoryImpl(myPsiManager)); - myProject.registerService(JavaPsiImplementationHelper.class, new CoreJavaPsiImplementationHelper()); + myProject.registerService(JavaPsiImplementationHelper.class, createJavaPsiImplementationHelper()); myProject.registerService(PsiResolveHelper.class, new PsiResolveHelperImpl(myPsiManager)); myProject.registerService(LanguageLevelProjectExtension.class, new CoreLanguageLevelProjectExtension()); myProject.registerService(JavaResolveCache.class, new JavaResolveCache(myMessageBus)); @@ -64,6 +63,10 @@ public class JavaCoreProjectEnvironment extends CoreProjectEnvironment { myProject.registerService(JavaPsiFacade.class, javaPsiFacade); } + protected CoreJavaPsiImplementationHelper createJavaPsiImplementationHelper() { + return new CoreJavaPsiImplementationHelper(); + } + protected JavaFileManager createCoreFileManager() { return new CoreJavaFileManager(myPsiManager); } From a5b0a7cc2dbeddb2067da5e6115cee9dc6b91ab7 Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Tue, 21 Aug 2012 16:57:57 +0200 Subject: [PATCH 16/27] method extracted --- .../editorActions/BackspaceHandler.java | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BackspaceHandler.java b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BackspaceHandler.java index b9867d440794..3fd3d14f6d3c 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BackspaceHandler.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/editorActions/BackspaceHandler.java @@ -162,19 +162,8 @@ public class BackspaceHandler extends EditorWriteActionHandler { if (caretPos.line == 0 || caretPos.column == 0) { return null; } - - final CharSequence charSeq = editor.getDocument().getCharsSequence(); - // smart backspace is activated only if all characters in the check range are whitespace characters - for(int pos=0; pos Date: Tue, 21 Aug 2012 17:06:49 +0200 Subject: [PATCH 17/27] EA-38347 - IAE: ModuleRootManager.getInstance --- .../ide/projectView/impl/nodes/ProjectViewModuleNode.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewModuleNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewModuleNode.java index 2f27d6f1e799..8bcdd7b6c4b5 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewModuleNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ProjectViewModuleNode.java @@ -30,6 +30,7 @@ import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.List; public class ProjectViewModuleNode extends AbstractModuleNode { @@ -45,7 +46,11 @@ public class ProjectViewModuleNode extends AbstractModuleNode { @NotNull public Collection getChildren() { - ModuleRootManager rootManager = ModuleRootManager.getInstance(getValue()); + Module module = getValue(); + if (module == null) { // module has been disposed + return Collections.emptyList(); + } + ModuleRootManager rootManager = ModuleRootManager.getInstance(module); ModuleFileIndex moduleFileIndex = rootManager.getFileIndex(); final VirtualFile[] contentRoots = rootManager.getContentRoots(); From 706977670b7839d7b405342648dd01203fa5985d Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Tue, 21 Aug 2012 19:05:57 +0400 Subject: [PATCH 18/27] IDEA-19061 Integrate the Rearranger-plugin into core-IDEA Remove custom equals() & hashCode() from ArrangementTreeNode - it breaks JTree UI caching mechanisms --- .../arrangement/ArrangementConfigUtil.java | 13 +++- .../ArrangementRuleEditingModel.java | 2 +- .../arrangement/ArrangementRuleTree.java | 69 ++++++++++++++----- .../arrangement/ArrangementTreeNode.java | 23 ------- 4 files changed, 63 insertions(+), 44 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtil.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtil.java index a76e6ad72a5f..199e19fcea04 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtil.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtil.java @@ -485,14 +485,14 @@ public class ArrangementConfigUtil { ArrangementTreeNode mergeCandidate = null; if (index > 0) { mergeCandidate = parent.getChildAt(index - 1); - if (!mergeCandidate.equals(child)) { + if (!hasEqualSetting(mergeCandidate, child)) { mergeCandidate = null; } } if (index < parent.getChildCount()) { ArrangementTreeNode n = parent.getChildAt(index); - if (n.equals(child)) { + if (hasEqualSetting(n, child)) { mergeCandidate = n; anchorAbove = true; } @@ -508,4 +508,13 @@ public class ArrangementConfigUtil { } return true; } + + private static boolean hasEqualSetting(@NotNull ArrangementTreeNode node1, @NotNull ArrangementTreeNode node2) { + ArrangementSettingsNode setting1 = node1.getBackingSetting(); + ArrangementSettingsNode setting2 = node2.getBackingSetting(); + if (setting1 == null || setting2 == null) { + return false; + } + return setting1.equals(setting2); + } } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModel.java index 15ba6702bccf..08b468814ae8 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModel.java @@ -54,6 +54,6 @@ public interface ArrangementRuleEditingModel { void addListener(@NotNull Listener listener); interface Listener { - void onChanged(@NotNull TreeNode topMost, @NotNull TreeNode bottomMost); + void onChanged(@NotNull ArrangementTreeNode topMost, @NotNull ArrangementTreeNode bottomMost); } } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java index 1506a96b4715..d8bb30c62e10 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java @@ -30,6 +30,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; +import javax.swing.event.TreeModelEvent; +import javax.swing.event.TreeModelListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.*; @@ -112,6 +114,7 @@ public class ArrangementRuleTree { onMouseClicked(e); } }); + myTreeModel.addTreeModelListener(new MyTreeModelListener()); List rules = new ArrayList(); rules.add(new ArrangementSettingsCompositeNode(ArrangementSettingsCompositeNode.Operator.AND) @@ -122,12 +125,12 @@ public class ArrangementRuleTree { rules.add(new ArrangementSettingsCompositeNode(ArrangementSettingsCompositeNode.Operator.AND) .addOperand(new ArrangementSettingsAtomNode(ArrangementSettingType.TYPE, ArrangementEntryType.FIELD)) .addOperand(new ArrangementSettingsAtomNode(ArrangementSettingType.MODIFIER, ArrangementModifier.PRIVATE))); - rules.add(new ArrangementSettingsCompositeNode(ArrangementSettingsCompositeNode.Operator.AND) - .addOperand(new ArrangementSettingsAtomNode(ArrangementSettingType.TYPE, ArrangementEntryType.METHOD)) - .addOperand(new ArrangementSettingsAtomNode(ArrangementSettingType.MODIFIER, ArrangementModifier.PUBLIC))); - rules.add(new ArrangementSettingsCompositeNode(ArrangementSettingsCompositeNode.Operator.AND) - .addOperand(new ArrangementSettingsAtomNode(ArrangementSettingType.TYPE, ArrangementEntryType.METHOD)) - .addOperand(new ArrangementSettingsAtomNode(ArrangementSettingType.MODIFIER, ArrangementModifier.PRIVATE))); + //rules.add(new ArrangementSettingsCompositeNode(ArrangementSettingsCompositeNode.Operator.AND) + // .addOperand(new ArrangementSettingsAtomNode(ArrangementSettingType.TYPE, ArrangementEntryType.METHOD)) + // .addOperand(new ArrangementSettingsAtomNode(ArrangementSettingType.MODIFIER, ArrangementModifier.PUBLIC))); + //rules.add(new ArrangementSettingsCompositeNode(ArrangementSettingsCompositeNode.Operator.AND) + // .addOperand(new ArrangementSettingsAtomNode(ArrangementSettingType.TYPE, ArrangementEntryType.METHOD)) + // .addOperand(new ArrangementSettingsAtomNode(ArrangementSettingType.MODIFIER, ArrangementModifier.PRIVATE))); map(root, rules, grouper); expandAll(myTree, new TreePath(root)); @@ -156,7 +159,7 @@ public class ArrangementRuleTree { private static void expandAll(Tree tree, TreePath parent) { // Traverse children TreeNode node = (TreeNode)parent.getLastPathComponent(); - if (node.getChildCount() >= 0) { + if (node.getChildCount() > 0) { for (Enumeration e = node.children(); e.hasMoreElements(); ) { TreeNode n = (TreeNode)e.nextElement(); TreePath path = parent.pathByAddingChild(n); @@ -293,15 +296,19 @@ public class ArrangementRuleTree { } } - private void onModelChange(@NotNull TreeNode topMost, @NotNull TreeNode bottomMost) { + private void onModelChange(@NotNull ArrangementTreeNode topMost, @NotNull ArrangementTreeNode bottomMost) { mySkipSelectionChange = true; try { - for (DefaultMutableTreeNode node = (DefaultMutableTreeNode)bottomMost; node != null; node = (DefaultMutableTreeNode)node.getParent()) { + for (ArrangementTreeNode node = bottomMost; node != null; node = node.getParent()) { TreePath path = new TreePath(node.getPath()); int row = myTree.getRowForPath(path); myRenderers.remove(row); + myTreeModel.nodeChanged(node); mySelectionModel.addSelectionPath(path); - getNodeComponentAt(row, (ArrangementSettingsNode)node.getUserObject()).setSelected(true); + ArrangementSettingsNode setting = node.getBackingSetting(); + if (setting != null) { + getNodeComponentAt(row, setting).setSelected(true); + } if (node == topMost) { break; } @@ -309,8 +316,6 @@ public class ArrangementRuleTree { } finally { mySkipSelectionChange = false; - // TODO den check - //expandAll(myTree, new TreePath(myTreeModel.getRoot())); } } @@ -322,15 +327,20 @@ public class ArrangementRuleTree { boolean expanded, boolean leaf, int row, - boolean hasFocus) - { - if (row < 0) { - return EMPTY_RENDERER; + boolean hasFocus) { + // TODO den remove + if (row > 0) { + myTree.getPathForRow(row); } - ArrangementSettingsNode node = (ArrangementSettingsNode)((DefaultMutableTreeNode)value).getUserObject(); + + ArrangementSettingsNode node = ((ArrangementTreeNode)value).getBackingSetting(); if (node == null) { return EMPTY_RENDERER; } + + if (row < 0) { + return myFactory.getComponent(node).getUiComponent(); + } return getNodeComponentAt(row, node).getUiComponent(); } } @@ -372,8 +382,31 @@ public class ArrangementRuleTree { private class MyModelChangeListener implements ArrangementRuleEditingModel.Listener { @Override - public void onChanged(@NotNull TreeNode topMost, @NotNull TreeNode bottomMost) { + public void onChanged(@NotNull ArrangementTreeNode topMost, @NotNull ArrangementTreeNode bottomMost) { onModelChange(topMost, bottomMost); } } + + private class MyTreeModelListener implements TreeModelListener { + @Override + public void treeNodesChanged(TreeModelEvent e) { + // TODO den implement + } + + @Override + public void treeNodesInserted(TreeModelEvent e) { + //expandAll(myTree, e.getTreePath()); + } + + @Override + public void treeNodesRemoved(TreeModelEvent e) { + // TODO den implement + int i = 1; + } + + @Override + public void treeStructureChanged(TreeModelEvent e) { + // TODO den implement + } + } } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementTreeNode.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementTreeNode.java index d828d71107dc..4bb26d0b8db1 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementTreeNode.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementTreeNode.java @@ -75,29 +75,6 @@ public class ArrangementTreeNode extends DefaultMutableTreeNode { return new ArrangementTreeNode(mySettings, myRow); } - @Override - public int hashCode() { - return mySettings != null ? mySettings.hashCode() : 0; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - - ArrangementTreeNode node = (ArrangementTreeNode)o; - - if (mySettings != null ? !mySettings.equals(node.mySettings) : node.mySettings != null) { - return false; - } - - return true; - } - @Override public ArrangementTreeNode getParent() { return (ArrangementTreeNode)super.getParent(); From 8f31a515819646dc922110ae2c66bd0032dd31bf Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Tue, 21 Aug 2012 19:33:04 +0400 Subject: [PATCH 19/27] IDEA-19061 Integrate the Rearranger-plugin into core-IDEA Auto-expanding nodes added during rules editing --- .../options/codeStyle/arrangement/ArrangementRuleTree.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java index d8bb30c62e10..be8915f2961c 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java @@ -297,6 +297,8 @@ public class ArrangementRuleTree { } private void onModelChange(@NotNull ArrangementTreeNode topMost, @NotNull ArrangementTreeNode bottomMost) { + expandAll(myTree, new TreePath(topMost.getPath())); + mySelectionModel.clearSelection(); mySkipSelectionChange = true; try { for (ArrangementTreeNode node = bottomMost; node != null; node = node.getParent()) { From d0977737cc7bd8aef538f75e08dbdb82dd561ac3 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 21 Aug 2012 15:33:10 +0400 Subject: [PATCH 20/27] Filtering out cache in more thread-safe way to avoid ConcurrentModificationException. --- .../BaseExternalAnnotationsManager.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java b/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java index a04f9b94c047..6739f1fb7d74 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java @@ -220,8 +220,23 @@ public abstract class BaseExternalAnnotationsManager extends ExternalAnnotations final List files = myExternalAnnotations.get(fqn); if (files == NULL) return null; if (files != null) { - for (Iterator it = files.iterator(); it.hasNext();) { - if (!it.next().isValid()) it.remove(); + boolean hasInvalidFiles = false; + for (PsiFile file : files) { + if (!file.isValid()) { + hasInvalidFiles = true; + break; + } + } + if (hasInvalidFiles) { + ArrayList onlyValid = new ArrayList(); + for (PsiFile file : files) { + if (file.isValid()) { + onlyValid.add(file); + } + } + onlyValid.trimToSize(); + myExternalAnnotations.put(fqn, onlyValid); + return onlyValid; } return files; } @@ -230,7 +245,7 @@ public abstract class BaseExternalAnnotationsManager extends ExternalAnnotations return null; } - List possibleAnnotationsXmls = new ArrayList(); + ArrayList possibleAnnotationsXmls = new ArrayList(); for (VirtualFile root : getExternalAnnotationsRoots(virtualFile)) { final VirtualFile ext = root.findFileByRelativePath(packageName.replace(".", "/") + "/" + ANNOTATIONS_XML); if (ext == null) continue; @@ -238,6 +253,7 @@ public abstract class BaseExternalAnnotationsManager extends ExternalAnnotations possibleAnnotationsXmls.add(psiFile); } if (!possibleAnnotationsXmls.isEmpty()) { + possibleAnnotationsXmls.trimToSize(); myExternalAnnotations.put(fqn, possibleAnnotationsXmls); return possibleAnnotationsXmls; } From 14ef0a9ac82cc993dc7bea76df0d09aafc82ac92 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 21 Aug 2012 15:44:48 +0400 Subject: [PATCH 21/27] Safer dropping caches in ExternalAnnotationsManager. --- .../codeInsight/ExternalAnnotationsManagerImpl.java | 10 +++++++--- .../codeInsight/BaseExternalAnnotationsManager.java | 2 ++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java index 34319e4e509c..3377210d6b16 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java @@ -91,13 +91,17 @@ public class ExternalAnnotationsManagerImpl extends BaseExternalAnnotationsManag connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { - myExternalAnnotations.clear(); - annotationsFileToDataAndModificationStamp.clear(); - myHasAnyAnnotationsRoots = ThreeState.UNSURE; + dropCache(); } }); } + @Override + protected void dropCache() { + super.dropCache(); + myHasAnyAnnotationsRoots = ThreeState.UNSURE; + } + @Override protected boolean hasAnyAnnotationsRoots() { if (myHasAnyAnnotationsRoots == ThreeState.UNSURE) { diff --git a/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java b/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java index 6739f1fb7d74..54ce02d8023a 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java @@ -262,6 +262,8 @@ public abstract class BaseExternalAnnotationsManager extends ExternalAnnotations } protected void dropCache() { + myExternalAnnotations.clear(); + annotationsFileToDataAndModificationStamp.clear(); cache.clear(); } From 79718ea2c7f3b1dd0b95e6421afc0e4c17caca89 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Tue, 21 Aug 2012 19:22:22 +0400 Subject: [PATCH 22/27] Changing files with external annotations within command and saving document. --- .../ExternalAnnotationsManagerImpl.java | 109 +++++++++++------- 1 file changed, 65 insertions(+), 44 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java index 3377210d6b16..baed7bd93348 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java @@ -27,9 +27,11 @@ import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.Result; +import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.command.undo.*; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.LogicalPosition; import com.intellij.openapi.editor.ScrollType; @@ -40,6 +42,7 @@ import com.intellij.openapi.editor.markup.TextAttributes; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; +import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -318,7 +321,7 @@ public class ExternalAnnotationsManagerImpl extends BaseExternalAnnotationsManag if (files == null) { return false; } - for (XmlFile file : files) { + for (final XmlFile file : files) { if (!file.isValid()) { continue; } @@ -337,7 +340,7 @@ public class ExternalAnnotationsManagerImpl extends BaseExternalAnnotationsManag if (!Comparing.strEqual(className, externalName) && !Comparing.strEqual(className, oldExternalName)) { continue; } - for (XmlTag annotationTag : tag.getSubTags()) { + for (final XmlTag annotationTag : tag.getSubTags()) { if (!Comparing.strEqual(annotationTag.getAttributeValue("name"), annotationFQN)) { continue; } @@ -345,15 +348,21 @@ public class ExternalAnnotationsManagerImpl extends BaseExternalAnnotationsManag .ensureFilesWritable(file.getVirtualFile()).hasReadonlyFiles()) { return false; } - try { - annotationTag.delete(); - if (tag.getSubTags().length == 0) { - tag.delete(); + CommandProcessor.getInstance().executeCommand(myPsiManager.getProject(), new Runnable() { + @Override + public void run() { + try { + annotationTag.delete(); + if (tag.getSubTags().length == 0) { + tag.delete(); + } + commitChanges(file); + } + catch (IncorrectOperationException e) { + LOG.error(e); + } } - } - catch (IncorrectOperationException e) { - LOG.error(e); - } + }, ExternalAnnotationsManagerImpl.class.getName(), null); return true; } return false; @@ -453,48 +462,60 @@ public class ExternalAnnotationsManagerImpl extends BaseExternalAnnotationsManag myExternalAnnotations.clear(); } - private void annotateExternally(@NotNull PsiModifierListOwner listOwner, - @NotNull String annotationFQName, + private void annotateExternally(@NotNull final PsiModifierListOwner listOwner, + @NotNull final String annotationFQName, @Nullable final XmlFile xmlFile, - @NotNull PsiFile codeUsageFile, - PsiNameValuePair[] values) { + @NotNull final PsiFile codeUsageFile, + final PsiNameValuePair[] values) { if (xmlFile == null) return; - try { - final XmlDocument document = xmlFile.getDocument(); - if (document != null) { - final XmlTag rootTag = document.getRootTag(); - final String externalName = getExternalName(listOwner, false); - if (rootTag != null) { - for (XmlTag tag : rootTag.getSubTags()) { - if (Comparing.strEqual(StringUtil.unescapeXml(tag.getAttributeValue("name")), externalName)) { - for (XmlTag annTag : tag.getSubTags()) { - if (Comparing.strEqual(annTag.getAttributeValue("name"), annotationFQName)) { - annTag.delete(); - break; + CommandProcessor.getInstance().executeCommand(myPsiManager.getProject(), new Runnable() { + @Override + public void run() { + try { + final XmlDocument document = xmlFile.getDocument(); + if (document != null) { + final XmlTag rootTag = document.getRootTag(); + final String externalName = getExternalName(listOwner, false); + if (rootTag != null) { + for (XmlTag tag : rootTag.getSubTags()) { + if (Comparing.strEqual(StringUtil.unescapeXml(tag.getAttributeValue("name")), externalName)) { + for (XmlTag annTag : tag.getSubTags()) { + if (Comparing.strEqual(annTag.getAttributeValue("name"), annotationFQName)) { + annTag.delete(); + break; + } + } + tag.add(XmlElementFactory.getInstance(myPsiManager.getProject()).createTagFromText( + createAnnotationTag(annotationFQName, values))); + return; } } - tag.add(XmlElementFactory.getInstance(myPsiManager.getProject()).createTagFromText( - createAnnotationTag(annotationFQName, values))); - return; + @NonNls String text = + "\n"; + text += createAnnotationTag(annotationFQName, values); + text += ""; + rootTag.add(XmlElementFactory.getInstance(myPsiManager.getProject()).createTagFromText(text)); } } - @NonNls String text = - "\n"; - text += createAnnotationTag(annotationFQName, values); - text += ""; - rootTag.add(XmlElementFactory.getInstance(myPsiManager.getProject()).createTagFromText(text)); + commitChanges(xmlFile); + } + catch (IncorrectOperationException e) { + LOG.error(e); + } + finally { + dropCache(); + if (codeUsageFile.getVirtualFile().isInLocalFileSystem()) { + UndoUtil.markPsiFileForUndo(codeUsageFile); + } } } - } - catch (IncorrectOperationException e) { - LOG.error(e); - } - finally { - dropCache(); - if (codeUsageFile.getVirtualFile().isInLocalFileSystem()) { - UndoUtil.markPsiFileForUndo(codeUsageFile); - } - } + }, ExternalAnnotationsManagerImpl.class.getName(), null); + } + + private void commitChanges(XmlFile xmlFile) { + Document doc = PsiDocumentManager.getInstance(myPsiManager.getProject()).getDocument(xmlFile); + assert doc != null; + FileDocumentManager.getInstance().saveDocument(doc); } @NonNls From 4299d76713a43c4d646aff3e9952a0f09b1fad1d Mon Sep 17 00:00:00 2001 From: Sergey Evdokimov Date: Tue, 21 Aug 2012 20:49:28 +0400 Subject: [PATCH 23/27] Fix unstable tests. --- .../java/org/jetbrains/idea/maven/MavenTestCase.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java index 576fea06d84e..8262452ff099 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/MavenTestCase.java @@ -476,8 +476,13 @@ public abstract class MavenTestCase extends UsefulTestCase { return file; } - private static void setFileContent(VirtualFile file, String content) throws IOException { - file.setBinaryContent(content.getBytes(), file.getModificationStamp() + 4000, file.getTimeStamp() + 4000); + private static void setFileContent(final VirtualFile file, final String content) throws IOException { + new WriteAction() { + @Override + protected void run(Result result) throws Throwable { + file.setBinaryContent(content.getBytes(), file.getModificationStamp() + 4000, file.getTimeStamp() + 4000); + } + }.execute().getResultObject(); } protected static void assertPathEquals(String expected, String actual) { From ae6085df764c3c55e0540636a474617f9c73a381 Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Tue, 21 Aug 2012 22:36:09 +0400 Subject: [PATCH 24/27] lambda: infer lambda formal parameters intention --- .../IntentionPowerPak/src/META-INF/plugin.xml | 4 + .../siyeh/IntentionPowerPackBundle.properties | 1 + .../InferLambdaParameterTypeIntention.java | 106 ++++++++++++++++++ .../after.java.template | 5 + .../before.java.template | 5 + .../description.html | 5 + .../AlreadyExist.java | 5 + .../CyclicInference.java | 13 +++ .../inferLambdaParameterType/Simple.java | 5 + .../Simple_after.java | 5 + .../inferLambdaParameterType/TwoParams.java | 9 ++ .../TwoParams_after.java | 9 ++ .../testSrc/com/siyeh/ipp/IPPTestCase.java | 8 +- ...InferLambdaParameterTypeIntentionTest.java | 47 ++++++++ 14 files changed, 225 insertions(+), 2 deletions(-) create mode 100644 plugins/IntentionPowerPak/src/com/siyeh/ipp/types/InferLambdaParameterTypeIntention.java create mode 100644 plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/after.java.template create mode 100644 plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/before.java.template create mode 100644 plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/description.html create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/AlreadyExist.java create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/CyclicInference.java create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/Simple.java create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/Simple_after.java create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/TwoParams.java create mode 100644 plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/TwoParams_after.java create mode 100644 plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/types/InferLambdaParameterTypeIntentionTest.java diff --git a/plugins/IntentionPowerPak/src/META-INF/plugin.xml b/plugins/IntentionPowerPak/src/META-INF/plugin.xml index ea732c38964d..480a706b72c7 100644 --- a/plugins/IntentionPowerPak/src/META-INF/plugin.xml +++ b/plugins/IntentionPowerPak/src/META-INF/plugin.xml @@ -214,6 +214,10 @@ com.siyeh.ipp.types.ReplaceLambdaWithAnonymousIntention intention.category.declaration + + com.siyeh.ipp.types.InferLambdaParameterTypeIntention + intention.category.declaration + com.siyeh.ipp.decls.ChangeVariableTypeToRhsTypeIntention diff --git a/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.properties b/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.properties index 2863ba9334c3..2baf3350b95a 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.properties +++ b/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.properties @@ -163,6 +163,7 @@ replace.diamond.with.explicit.type.arguments.intention.name=Replace '<>' with ex replace.diamond.with.explicit.type.arguments.intention.family.name=Replace Diamond with Explicit Type Arguments replace.lambda.with.anonymous.intention.name=Replace lambda with anonymous class replace.lambda.with.anonymous.intention.name.family.name=Replace lambda with anonymous class +infer.lambda.parameter.type.intention.name.family.name=Infer lambda parameter type make.public.intention.name=Make 'public' make.public.intention.family.name=Make Public make.package.private.intention.name=Make package-local diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/InferLambdaParameterTypeIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/InferLambdaParameterTypeIntention.java new file mode 100644 index 000000000000..1122d058883d --- /dev/null +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/types/InferLambdaParameterTypeIntention.java @@ -0,0 +1,106 @@ +/* + * Copyright 2011 Bas Leijdekkers + * + * 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.siyeh.ipp.types; + +import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.text.StringUtil; +import com.intellij.psi.*; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.util.PsiUtil; +import com.intellij.util.Function; +import com.intellij.util.IncorrectOperationException; +import com.siyeh.ipp.base.Intention; +import com.siyeh.ipp.base.PsiElementPredicate; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +public class InferLambdaParameterTypeIntention extends Intention { + private static final Logger LOG = Logger.getInstance("#" + InferLambdaParameterTypeIntention.class.getName()); + private String myInferredTypesText; + + @NotNull + @Override + protected PsiElementPredicate getElementPredicate() { + return new LambdaParametersPredicate(); + } + + @NotNull + @Override + public String getText() { + return "Expand lambda to " + myInferredTypesText + " -> {...}"; + } + + @Override + protected void processIntention(@NotNull PsiElement element) throws IncorrectOperationException { + final PsiLambdaExpression lambdaExpression = PsiTreeUtil.getParentOfType(element, PsiLambdaExpression.class); + LOG.assertTrue(lambdaExpression != null); + final PsiType functionalInterfaceType = lambdaExpression.getFunctionalInterfaceType(); + final String buf = getInferredTypes(functionalInterfaceType, lambdaExpression); + lambdaExpression.getParameterList().replace(JavaPsiFacade.getElementFactory(element.getProject()).createMethodFromText("void foo" + buf, + element).getParameterList()); + } + + @Nullable + private static String getInferredTypes(PsiType functionalInterfaceType, final PsiLambdaExpression lambdaExpression) { + final PsiClassType.ClassResolveResult resolveResult = PsiUtil.resolveGenericsClassInType(functionalInterfaceType); + final StringBuilder buf = new StringBuilder(); + buf.append("("); + final PsiMethod interfaceMethod = LambdaUtil.getFunctionalInterfaceMethod(functionalInterfaceType); + LOG.assertTrue(interfaceMethod != null); + final PsiParameter[] parameters = interfaceMethod.getParameterList().getParameters(); + final PsiParameter[] lambdaParameters = lambdaExpression.getParameterList().getParameters(); + if (parameters.length != lambdaParameters.length) return null; + for (int i = 0; i < parameters.length; i++) { + PsiParameter parameter = parameters[i]; + final PsiType psiType = resolveResult.getSubstitutor().substitute(parameter.getType()); + if (psiType != null) { + buf.append(psiType.getPresentableText()).append(" ").append(lambdaParameters[i].getName()); + } + else { + buf.append(lambdaParameters[i].getName()); + } + if (i < parameters.length - 1) { + buf.append(", "); + } + } + buf.append(")"); + return buf.toString(); + } + + + private class LambdaParametersPredicate implements PsiElementPredicate { + @Override + public boolean satisfiedBy(PsiElement element) { + final PsiLambdaExpression lambdaExpression = PsiTreeUtil.getParentOfType(element, PsiLambdaExpression.class); + if (lambdaExpression != null) { + for (PsiParameter parameter : lambdaExpression.getParameterList().getParameters()) { + if (parameter.getTypeElement() != null) { + return false; + } + } + if (PsiTreeUtil.isAncestor(lambdaExpression.getParameterList(), element, false)) { + final PsiType functionalInterfaceType = lambdaExpression.getFunctionalInterfaceType(); + if (functionalInterfaceType != null && LambdaUtil.getFunctionalInterfaceMethod(functionalInterfaceType) != null && LambdaUtil.isLambdaFullyInferred(lambdaExpression, functionalInterfaceType)) { + myInferredTypesText = getInferredTypes(functionalInterfaceType, lambdaExpression); + return myInferredTypesText != null; + } + } + } + return false; + } + } +} diff --git a/plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/after.java.template b/plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/after.java.template new file mode 100644 index 000000000000..b299b06a1741 --- /dev/null +++ b/plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/after.java.template @@ -0,0 +1,5 @@ +class X { + { + Comparable c = (String o) -> 1; + } +} \ No newline at end of file diff --git a/plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/before.java.template b/plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/before.java.template new file mode 100644 index 000000000000..52a04c459e44 --- /dev/null +++ b/plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/before.java.template @@ -0,0 +1,5 @@ +class X { + { + Comparable c = o -> 1; + } +} \ No newline at end of file diff --git a/plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/description.html b/plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/description.html new file mode 100644 index 000000000000..add8e7547c4a --- /dev/null +++ b/plugins/IntentionPowerPak/src/intentionDescriptions/InferLambdaParameterTypeIntention/description.html @@ -0,0 +1,5 @@ + + +This intention extends lambda parameters to contain formal types + + \ No newline at end of file diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/AlreadyExist.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/AlreadyExist.java new file mode 100644 index 000000000000..7d73eeaa7232 --- /dev/null +++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/AlreadyExist.java @@ -0,0 +1,5 @@ +class X { + { + Comparable c = (String o) -> 1; + } +} \ No newline at end of file diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/CyclicInference.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/CyclicInference.java new file mode 100644 index 000000000000..981d5e6b04cd --- /dev/null +++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/CyclicInference.java @@ -0,0 +1,13 @@ +class Test2 { + class Y{} + + interface I { + X foo(Y list); + } + + static I bar(I i){return i;} + + { + bar(x -> x); + } +} \ No newline at end of file diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/Simple.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/Simple.java new file mode 100644 index 000000000000..ac67094f92ea --- /dev/null +++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/Simple.java @@ -0,0 +1,5 @@ +class X { + { + Comparable c = o -> 1; + } +} \ No newline at end of file diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/Simple_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/Simple_after.java new file mode 100644 index 000000000000..5835eda2f6fb --- /dev/null +++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/Simple_after.java @@ -0,0 +1,5 @@ +class X { + { + Comparable c = (String o)-> 1; + } +} \ No newline at end of file diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/TwoParams.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/TwoParams.java new file mode 100644 index 000000000000..3e0863253ef4 --- /dev/null +++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/TwoParams.java @@ -0,0 +1,9 @@ +class X { + interface I { + void foo(A a1, A a2); + } + + { + I c = (o1, o2) -> {}; + } +} \ No newline at end of file diff --git a/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/TwoParams_after.java b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/TwoParams_after.java new file mode 100644 index 000000000000..7f9733d47279 --- /dev/null +++ b/plugins/IntentionPowerPak/test/com/siyeh/ipp/types/inferLambdaParameterType/TwoParams_after.java @@ -0,0 +1,9 @@ +class X { + interface I { + void foo(A a1, A a2); + } + + { + I c = (String o1, String o2)-> {}; + } +} \ No newline at end of file diff --git a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/IPPTestCase.java b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/IPPTestCase.java index 1f8c3bf2029b..5060fbd1e9c2 100644 --- a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/IPPTestCase.java +++ b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/IPPTestCase.java @@ -37,10 +37,14 @@ public abstract class IPPTestCase extends LightCodeInsightFixtureTestCase { } protected void assertIntentionNotAvailable() { + assertIntentionNotAvailable(getIntentionName()); + } + + protected void assertIntentionNotAvailable(final String intentionName) { final String testName = getTestName(false); myFixture.configureByFile(testName + ".java"); - assertEmpty("Intention \'" + getIntentionName() + "\' is available but should not", - myFixture.filterAvailableIntentions(getIntentionName())); + assertEmpty("Intention \'" + intentionName + "\' is available but should not", + myFixture.filterAvailableIntentions(intentionName)); } protected abstract String getIntentionName(); diff --git a/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/types/InferLambdaParameterTypeIntentionTest.java b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/types/InferLambdaParameterTypeIntentionTest.java new file mode 100644 index 000000000000..2a3f2714840c --- /dev/null +++ b/plugins/IntentionPowerPak/testSrc/com/siyeh/ipp/types/InferLambdaParameterTypeIntentionTest.java @@ -0,0 +1,47 @@ +/* + * 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.siyeh.ipp.types; + +import com.siyeh.ipp.IPPTestCase; + +public class InferLambdaParameterTypeIntentionTest extends IPPTestCase { + + public void testSimple() { + doTest("Expand lambda to (String o) -> {...}"); + } + + public void testTwoParams() { + doTest("Expand lambda to (String o1, String o2) -> {...}"); + } + + public void testAlreadyExist() throws Exception { + assertIntentionNotAvailable("Expand lambda to (String o) -> {...}"); + } + + public void testCyclicInference() throws Exception { + assertIntentionNotAvailable("Expand lambda to (Object x) -> {...}"); + } + + @Override + protected String getIntentionName() { + return ""; + } + + @Override + protected String getRelativePath() { + return "types/inferLambdaParameterType"; + } +} From d9511284da020ac49fbe5f0b8a0b9c724c34c6d0 Mon Sep 17 00:00:00 2001 From: "Denis.Zhdanov" Date: Tue, 21 Aug 2012 23:30:42 +0400 Subject: [PATCH 25/27] IDEA-19061 Integrate the Rearranger-plugin into core-IDE 1. Correct rule editing on multi-row change; 2. Handle a rule tree's root visibility; --- .../ArrangementConfigUtilTest.groovy | 2 +- .../arrangement/ArrangementConfigUtil.java | 32 ++++++++------- .../ArrangementRuleEditingModelBuilder.java | 2 +- .../ArrangementRuleEditingModelImpl.java | 32 +++++++-------- .../arrangement/ArrangementRuleTree.java | 39 +++---------------- 5 files changed, 42 insertions(+), 65 deletions(-) diff --git a/java/java-tests/testSrc/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtilTest.groovy b/java/java-tests/testSrc/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtilTest.groovy index ceba2cd92113..5437624113ca 100644 --- a/java/java-tests/testSrc/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtilTest.groovy +++ b/java/java-tests/testSrc/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtilTest.groovy @@ -228,7 +228,7 @@ four = '4'() } private static def doReplace(initial, from, to, replacement) { - ArrangementConfigUtil.replace(from, to, replacement, new DefaultTreeModel(initial)) + ArrangementConfigUtil.replace(from, to, replacement, new DefaultTreeModel(initial), true) } private static def doInsert(parent, i, child) { diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtil.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtil.java index 199e19fcea04..f6d2d9a6943e 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtil.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementConfigUtil.java @@ -222,6 +222,7 @@ public class ArrangementConfigUtil { * @param to indicates end of the node sub-hierarchy to be replaced (inclusive) * @param replacement root of the node sub-hierarchy which should replace the one identified by the given 'start' and 'end' nodes * @param treeModel model which should hold ui nodes + * @param rootVisible determines if the root should be count during rows calculations * @return collection of row changes at the form {@code 'old row -> new row'} */ @SuppressWarnings("AssignmentToForLoopParameter") @@ -229,15 +230,16 @@ public class ArrangementConfigUtil { public static TIntIntHashMap replace(@NotNull ArrangementTreeNode from, @NotNull ArrangementTreeNode to, @NotNull ArrangementTreeNode replacement, - @NotNull DefaultTreeModel treeModel) + @NotNull DefaultTreeModel treeModel, + boolean rootVisible) { - markRows(from); + markRows(from, rootVisible); if (from == to) { ArrangementTreeNode parent = from.getParent(); int index = parent.getIndex(from); treeModel.removeNodeFromParent(from); treeModel.insertNodeInto(replacement, parent, index); - return collectRowChangesAndUnmark(parent); + return collectRowChangesAndUnmark(parent, rootVisible); } // The algorithm looks as follows: @@ -342,17 +344,18 @@ public class ArrangementConfigUtil { } //endregion - return collectRowChangesAndUnmark(root); + return collectRowChangesAndUnmark(root, rootVisible); } /** * Enriches every node at the hierarchy denoted by the given node by information about it's row. * - * @param node reference to the target hierarchy + * @param node reference to the target hierarchy + * @param rootVisible determines if the root should be count during rows calculations */ - private static void markRows(@NotNull ArrangementTreeNode node) { + private static void markRows(@NotNull ArrangementTreeNode node, boolean rootVisible) { ArrangementTreeNode root = getRoot(node); - int row = 0; + int row = rootVisible ? 0 : -1; Stack nodes = new Stack(); nodes.push(root); while (!nodes.isEmpty()) { @@ -375,7 +378,7 @@ public class ArrangementConfigUtil { /** * Processes hierarchy denoted by the given node assuming that every node there contains information about its initial row - * (see {@link #markRows(ArrangementTreeNode)}). + * (see {@link #markRows(ArrangementTreeNode, boolean)}). *

* Collects all row changes and returns them. All row information is dropped from the nodes during the current method processing. * @@ -383,10 +386,10 @@ public class ArrangementConfigUtil { * @return collection of row changes at the form {@code 'old row -> new row'} */ @NotNull - private static TIntIntHashMap collectRowChangesAndUnmark(@NotNull ArrangementTreeNode node) { + private static TIntIntHashMap collectRowChangesAndUnmark(@NotNull ArrangementTreeNode node, boolean rootVisible) { @NotNull TIntIntHashMap changes = new TIntIntHashMap(); ArrangementTreeNode root = getRoot(node); - int row = 0; + int row = rootVisible ? 0 : -1; Stack nodes = new Stack(); nodes.push(root); while (!nodes.isEmpty()) { @@ -406,12 +409,13 @@ public class ArrangementConfigUtil { /** * Allows to map given node to its row at the hierarchy. * - * @param node target node - * @return given node's row at the nodes hierarchy (0-based) + * @param node target node + * @param rootVisible determines if the root should be count on rows calculation + * @return given node's row at the nodes hierarchy (0-based) */ - public static int getRow(@NotNull ArrangementTreeNode node) { + public static int getRow(@NotNull ArrangementTreeNode node, boolean rootVisible) { ArrangementTreeNode root = getRoot(node); - int row = 0; + int row = rootVisible ? 0 : -1; Stack nodes = new Stack(); nodes.push(root); while (!nodes.isEmpty()) { diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelBuilder.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelBuilder.java index cb20a2da154f..491e8ebd43bd 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelBuilder.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelBuilder.java @@ -105,7 +105,7 @@ public class ArrangementRuleEditingModelBuilder { grouper, rowMappings, row, - tree.isRootVisible() ? 0 : -1 + tree.isRootVisible() ); rowMappings.put(row, model); } diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelImpl.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelImpl.java index a96255425d90..34b2770514a6 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelImpl.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleEditingModelImpl.java @@ -44,7 +44,7 @@ public class ArrangementRuleEditingModelImpl implements ArrangementRuleEditingMo @NotNull private final DefaultTreeModel myTreeModel; @NotNull private final TIntObjectHashMap myRowMappings; @NotNull private final ArrangementSettingsGrouper myGrouper; - private final int myRowShift; + private final boolean myRootVisible; @NotNull private ArrangementTreeNode myTopMost; @NotNull private ArrangementTreeNode myBottomMost; @@ -54,17 +54,17 @@ public class ArrangementRuleEditingModelImpl implements ArrangementRuleEditingMo /** * Creates new ArrangementRuleEditingModelImpl object. * - * @param model tree model which holds target ui nodes. Basically, we need to perform ui nodes modification via it in order - * to generate corresponding events automatically - * @param node backing settings node - * @param topMost there is a possible case that a single settings node is shown in more than one visual line + * @param model tree model which holds target ui nodes. Basically, we need to perform ui nodes modification via it in order + * to generate corresponding events automatically + * @param node backing settings node + * @param topMost there is a possible case that a single settings node is shown in more than one visual line * ({@link HierarchicalArrangementSettingsNode}). This argument is the top-most UI node used for the * settings node representation - * @param bottomMost bottom-most UI node used for the given settings node representation - * @param grouper strategy that encapsulates information on how settings node should be displayed - * @param mappings {@code 'row -> model'} mappings - * @param row row number for which current model is registered at the given model mappings - * @param shift specifies a shift to be applied to the node rows on model modification. Primary intention is to handle + * @param bottomMost bottom-most UI node used for the given settings node representation + * @param grouper strategy that encapsulates information on how settings node should be displayed + * @param mappings {@code 'row -> model'} mappings + * @param row row number for which current model is registered at the given model mappings + * @param rootVisible determines if the root should be count during rows calculations */ public ArrangementRuleEditingModelImpl(@NotNull DefaultTreeModel model, @NotNull ArrangementSettingsNode node, @@ -73,7 +73,7 @@ public class ArrangementRuleEditingModelImpl implements ArrangementRuleEditingMo @NotNull ArrangementSettingsGrouper grouper, @NotNull TIntObjectHashMap mappings, int row, - int shift) + boolean rootVisible) { myTreeModel = model; mySettingsNode = node; @@ -82,7 +82,7 @@ public class ArrangementRuleEditingModelImpl implements ArrangementRuleEditingMo myGrouper = grouper; myRowMappings = mappings; myRow = row; - myRowShift = shift; + myRootVisible = rootVisible; refreshConditions(); } @@ -185,7 +185,7 @@ public class ArrangementRuleEditingModelImpl implements ArrangementRuleEditingMo Pair replacement = ArrangementConfigUtil.map(null, grouped, null); ArrangementTreeNode newBottom = replacement.first; ArrangementTreeNode newTop = ArrangementConfigUtil.getRoot(newBottom); - final TIntIntHashMap rowChanges = ArrangementConfigUtil.replace(myTopMost, myBottomMost, newTop, myTreeModel); + final TIntIntHashMap rowChanges = ArrangementConfigUtil.replace(myTopMost, myBottomMost, newTop, myTreeModel, myRootVisible); myTopMost = newTop; myBottomMost = newBottom; @@ -198,8 +198,8 @@ public class ArrangementRuleEditingModelImpl implements ArrangementRuleEditingMo if (row == myRow) { return true; } - if (rowChanges.containsKey(row - myRowShift)) { - newMappings.put(rowChanges.get(row - myRowShift) + myRowShift, model); + if (rowChanges.containsKey(row)) { + newMappings.put(rowChanges.get(row), model); } else { newMappings.put(row, model); @@ -208,7 +208,7 @@ public class ArrangementRuleEditingModelImpl implements ArrangementRuleEditingMo return true; } }); - myRow = ArrangementConfigUtil.getRow(myBottomMost) + myRowShift; + myRow = ArrangementConfigUtil.getRow(myBottomMost, myRootVisible); newMappings.put(myRow, this); myRowMappings.clear(); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java index be8915f2961c..39580690cae2 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRuleTree.java @@ -30,8 +30,6 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import javax.swing.*; -import javax.swing.event.TreeModelEvent; -import javax.swing.event.TreeModelListener; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import javax.swing.tree.*; @@ -114,7 +112,6 @@ public class ArrangementRuleTree { onMouseClicked(e); } }); - myTreeModel.addTreeModelListener(new MyTreeModelListener()); List rules = new ArrayList(); rules.add(new ArrangementSettingsCompositeNode(ArrangementSettingsCompositeNode.Operator.AND) @@ -145,6 +142,9 @@ public class ArrangementRuleTree { for (TreePath p = path; p != null; p = p.getParentPath()) { int row = myTree.getRowForPath(p); + if (row < 0) { + row = ((ArrangementTreeNode)p.getLastPathComponent()).getRow(); + } if (row < 0) { return; } @@ -299,7 +299,7 @@ public class ArrangementRuleTree { private void onModelChange(@NotNull ArrangementTreeNode topMost, @NotNull ArrangementTreeNode bottomMost) { expandAll(myTree, new TreePath(topMost.getPath())); mySelectionModel.clearSelection(); - mySkipSelectionChange = true; + //mySkipSelectionChange = true; try { for (ArrangementTreeNode node = bottomMost; node != null; node = node.getParent()) { TreePath path = new TreePath(node.getPath()); @@ -329,12 +329,8 @@ public class ArrangementRuleTree { boolean expanded, boolean leaf, int row, - boolean hasFocus) { - // TODO den remove - if (row > 0) { - myTree.getPathForRow(row); - } - + boolean hasFocus) + { ArrangementSettingsNode node = ((ArrangementTreeNode)value).getBackingSetting(); if (node == null) { return EMPTY_RENDERER; @@ -388,27 +384,4 @@ public class ArrangementRuleTree { onModelChange(topMost, bottomMost); } } - - private class MyTreeModelListener implements TreeModelListener { - @Override - public void treeNodesChanged(TreeModelEvent e) { - // TODO den implement - } - - @Override - public void treeNodesInserted(TreeModelEvent e) { - //expandAll(myTree, e.getTreePath()); - } - - @Override - public void treeNodesRemoved(TreeModelEvent e) { - // TODO den implement - int i = 1; - } - - @Override - public void treeStructureChanged(TreeModelEvent e) { - // TODO den implement - } - } } From e07dacb6336beba3fb0ced91884fee2fb08b1ac3 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 22 Aug 2012 09:28:33 +0400 Subject: [PATCH 26/27] fixed memory leak in tests --- .../compiler/server/BuildManager.java | 6 ++++ .../intellij/compiler/CompilerTestUtil.java | 28 +++++++++++++++++++ .../compiler/GroovyCompilerTestCase.java | 22 ++------------- 3 files changed, 37 insertions(+), 19 deletions(-) diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java index 2980b7862698..14c5e330f782 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java @@ -77,6 +77,7 @@ import org.jboss.netty.handler.codec.protobuf.ProtobufVarint32LengthFieldPrepend import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.TestOnly; import org.jetbrains.jps.api.*; import org.jetbrains.jps.cmdline.BuildMain; import org.jetbrains.jps.cmdline.ClasspathBootstrap; @@ -916,6 +917,11 @@ public class BuildManager implements ApplicationComponent{ return listenPort; } + @TestOnly + public void stopWatchingProject(Project project) { + myProjectDataMap.remove(getProjectPath(project)); + } + private static String classpathToString(List cp) { StringBuilder builder = new StringBuilder(); for (File file : cp) { diff --git a/java/compiler/impl/testSrc/com/intellij/compiler/CompilerTestUtil.java b/java/compiler/impl/testSrc/com/intellij/compiler/CompilerTestUtil.java index fccbe1606c53..120e1518ef2d 100644 --- a/java/compiler/impl/testSrc/com/intellij/compiler/CompilerTestUtil.java +++ b/java/compiler/impl/testSrc/com/intellij/compiler/CompilerTestUtil.java @@ -2,8 +2,13 @@ package com.intellij.compiler; import com.intellij.compiler.impl.TranslatingCompilerFilesMonitor; import com.intellij.compiler.impl.javaCompiler.javac.JavacSettings; +import com.intellij.compiler.server.BuildManager; +import com.intellij.openapi.application.Result; +import com.intellij.openapi.application.WriteAction; +import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.ProjectJdkTable; +import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl; import com.intellij.openapi.projectRoots.impl.ProjectJdkTableImpl; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.util.JDOMUtil; @@ -55,4 +60,27 @@ public class CompilerTestUtil { throw new RuntimeException(e); } } + + public static void enableExternalCompiler(final Project project) { + new WriteAction() { + protected void run(final Result result) { + CompilerWorkspaceConfiguration.getInstance(project).USE_COMPILE_SERVER = true; + ApplicationManagerEx.getApplicationEx().doNotSave(false); + JavaAwareProjectJdkTableImpl table = JavaAwareProjectJdkTableImpl.getInstanceEx(); + table.addJdk(table.getInternalJdk()); + } + }.execute(); + } + + public static void disableExternalCompiler(final Project project) { + new WriteAction() { + protected void run(final Result result) { + CompilerWorkspaceConfiguration.getInstance(project).USE_COMPILE_SERVER = false; + ApplicationManagerEx.getApplicationEx().doNotSave(true); + JavaAwareProjectJdkTableImpl table = JavaAwareProjectJdkTableImpl.getInstanceEx(); + table.removeJdk(table.getInternalJdk()); + BuildManager.getInstance().stopWatchingProject(project); + } + }.execute(); + } } diff --git a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java index 86900f6c8145..7ab37ba8e41e 100644 --- a/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java +++ b/plugins/groovy/test/org/jetbrains/plugins/groovy/compiler/GroovyCompilerTestCase.java @@ -17,7 +17,6 @@ package org.jetbrains.plugins.groovy.compiler; import com.intellij.compiler.CompilerManagerImpl; import com.intellij.compiler.CompilerTestUtil; -import com.intellij.compiler.CompilerWorkspaceConfiguration; import com.intellij.execution.ExecutionException; import com.intellij.execution.Executor; import com.intellij.execution.application.ApplicationConfiguration; @@ -33,14 +32,12 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.application.AccessToken; import com.intellij.openapi.application.Result; import com.intellij.openapi.application.WriteAction; -import com.intellij.openapi.application.ex.ApplicationManagerEx; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.compiler.*; import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.StdModuleTypes; -import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl; import com.intellij.openapi.projectRoots.impl.JavaSdkImpl; import com.intellij.openapi.roots.*; @@ -94,13 +91,8 @@ public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestC //noinspection ConstantConditions CompilerProjectExtension.getInstance(getProject()).setCompilerOutputUrl(myMainOutput.findOrCreateDir("out").getUrl()); if (useJps()) { - ApplicationManagerEx.getApplicationEx().doNotSave(false); - CompilerWorkspaceConfiguration.getInstance(getProject()).USE_COMPILE_SERVER = true; - - JavaAwareProjectJdkTableImpl jdkTable = JavaAwareProjectJdkTableImpl.getInstanceEx(); - Sdk internalJdk = jdkTable.getInternalJdk(); - jdkTable.addJdk(internalJdk); - ModuleRootModificationUtil.setModuleSdk(myModule, internalJdk); + CompilerTestUtil.enableExternalCompiler(getProject()); + ModuleRootModificationUtil.setModuleSdk(myModule, JavaAwareProjectJdkTableImpl.getInstanceEx().getInternalJdk()); } } }.execute(); @@ -125,15 +117,7 @@ public abstract class GroovyCompilerTestCase extends JavaCodeInsightFixtureTestC public void run() { try { if (useJps()) { - CompilerWorkspaceConfiguration.getInstance(getProject()).USE_COMPILE_SERVER = false; - ApplicationManagerEx.getApplicationEx().doNotSave(true); - new WriteCommandAction(getProject()) { - @Override - protected void run(Result result) throws Throwable { - final JavaAwareProjectJdkTableImpl jdkTable = JavaAwareProjectJdkTableImpl.getInstanceEx(); - jdkTable.removeJdk(jdkTable.getInternalJdk()); - } - }.execute(); + CompilerTestUtil.disableExternalCompiler(getProject()); } myMainOutput.tearDown(); From 7566dbdb577f239c0901f49e5eb398902d177b64 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 22 Aug 2012 12:22:31 +0400 Subject: [PATCH 27/27] external compiler: don't rebuild all artifacts on project rebuild --- .../src/org/jetbrains/jps/cmdline/BuildRunner.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java index fd3ea5c4a36d..fb3dce694c17 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildRunner.java @@ -145,14 +145,9 @@ public class BuildRunner { Collection paths, boolean includeTests) throws Exception { final Timestamps timestamps = pd.timestamps.getStorage(); Set artifacts = new HashSet(); - if (artifactNames.isEmpty() && buildType == BuildType.PROJECT_REBUILD) { - artifacts.addAll(JpsBuilderArtifactService.getInstance().getArtifacts(pd.jpsModel, false)); - } - else { - for (JpsArtifact artifact : JpsBuilderArtifactService.getInstance().getArtifacts(pd.jpsModel, false)) { - if (artifactNames.contains(artifact.getName()) && !StringUtil.isEmpty(artifact.getOutputPath())) { - artifacts.add(artifact); - } + for (JpsArtifact artifact : JpsBuilderArtifactService.getInstance().getArtifacts(pd.jpsModel, false)) { + if (artifactNames.contains(artifact.getName()) && !StringUtil.isEmpty(artifact.getOutputPath())) { + artifacts.add(artifact); } }