MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Kirill Likhodedov
2012-01-30 16:10:57 +04:00
parent bdb12e05b8 eb13591612
commit 5ffb62f017
25 changed files with 435 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+21 -16
View File
@@ -390,6 +390,8 @@ public class IncProjectBuilder {
final BuildDataManager dataManager = context.getDataManager();
final boolean compilingTests = context.isCompilingTests();
try {
final Collection<String> allOutputs = new LinkedList<String>();
context.processFilesToRecompile(chunk, new FileProcessor() {
private final Map<Module, SourceToOutputMapping> storageMap = new HashMap<Module, SourceToOutputMapping>();
@@ -403,24 +405,11 @@ public class IncProjectBuilder {
final String srcPath = FileUtil.toSystemIndependentName(file.getPath());
final Collection<String> outputs = srcToOut.getState(srcPath);
if (LOG.isDebugEnabled()) {
if (outputs != null && context.isMake()) {
LOG.info("Cleaning output files:");
final String[] buffer = new String[outputs.size()];
int i = 0;
for (String output : outputs) {
buffer[i++] = output;
}
Arrays.sort(buffer);
for (String output : buffer) {
LOG.info(output);
}
LOG.info("End of files");
}
}
if (outputs != null) {
for (String output : outputs) {
if (LOG.isDebugEnabled()) {
allOutputs.add(output);
}
FileUtil.delete(new File(output));
}
srcToOut.remove(srcPath);
@@ -428,6 +417,22 @@ public class IncProjectBuilder {
return true;
}
});
if (LOG.isDebugEnabled()) {
if (context.isMake() && allOutputs.size() > 0) {
LOG.info("Cleaning output files:");
final String[] buffer = new String[allOutputs.size()];
int i = 0;
for (String output : allOutputs) {
buffer[i++] = output;
}
Arrays.sort(buffer);
for (String output : buffer) {
LOG.info(output);
}
LOG.info("End of files");
}
}
}
catch (Exception e) {
throw new ProjectBuildException(e);
jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
+55 -56
View File
@@ -59,7 +59,61 @@ public abstract class IncrementalTestCase extends TestCase {
return s;
}
}
static {
Logger.setFactory(new Logger.Factory() {
@Override
public Logger getLoggerInstance(String category) {
final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(category);
final boolean affectedLogger = category.equals("#org.jetbrains.jps.incremental.java.JavaBuilder") ||
category.equals("#org.jetbrains.jps.incremental.IncProjectBuilder");
return new Logger() {
@Override
public boolean isDebugEnabled() {
return affectedLogger;
}
@Override
public void debug(@NonNls String message) {
}
@Override
public void debug(@Nullable Throwable t) {
}
@Override
public void debug(@NonNls String message, @Nullable Throwable t) {
}
@Override
public void error(@NonNls String message, @Nullable Throwable t, @NonNls String... details) {
}
@Override
public void info(@NonNls String message) {
if (affectedLogger) {
logger.info(stripper.strip(message));
}
}
@Override
public void info(@NonNls String message, @Nullable Throwable t) {
}
@Override
public void warn(@NonNls String message, @Nullable Throwable t) {
}
@Override
public void setLevel(Level level) {
}
};
}
});
}
private static RootStripper stripper = new RootStripper();
private final String groupName;
@@ -198,61 +252,6 @@ public abstract class IncrementalTestCase extends TestCase {
properties.setProperty("log4j.appender.A1.layout.ConversionPattern", "%m%n");
PropertyConfigurator.configure(properties);
Logger.setFactory(new Logger.Factory() {
@Override
public Logger getLoggerInstance(String category) {
final org.apache.log4j.Logger logger = org.apache.log4j.Logger.getLogger(category);
final boolean affectedLogger = category.equals("#org.jetbrains.jps.incremental.java.JavaBuilder") ||
category.equals("#org.jetbrains.jps.incremental.IncProjectBuilder");
final String root = getWorkDir() + File.separator;
final int pos = root.length();
return new Logger() {
@Override
public boolean isDebugEnabled() {
return affectedLogger;
}
@Override
public void debug(@NonNls String message) {
}
@Override
public void debug(@Nullable Throwable t) {
}
@Override
public void debug(@NonNls String message, @Nullable Throwable t) {
}
@Override
public void error(@NonNls String message, @Nullable Throwable t, @NonNls String... details) {
}
@Override
public void info(@NonNls String message) {
if (affectedLogger) {
logger.info(stripper.strip(message));
}
}
@Override
public void info(@NonNls String message, @Nullable Throwable t) {
}
@Override
public void warn(@NonNls String message, @Nullable Throwable t) {
}
@Override
public void setLevel(Level level) {
}
};
}
});
}
public void doTest() throws Exception {
platform/lang-impl/src/com/intellij/execution/ui/layout/actions/CloseViewAction.java
+7 -3
View File
@@ -29,16 +29,20 @@ public class CloseViewAction extends BaseViewAction {
private static final Icon HOVERED_ICON = IconLoader.getIcon("/actions/closeNewHovered.png");
protected void update(final AnActionEvent e, final ViewContext context, final Content[] content) {
setEnabled(e, isEnabled(context, content, e.getPlace()));
setEnabled(e, isEnabled(content));
e.getPresentation().setIcon(ICON);
e.getPresentation().setHoveredIcon(HOVERED_ICON);
}
protected void actionPerformed(final AnActionEvent e, final ViewContext context, final Content[] content) {
context.getContentManager().removeContent(content[0], context.isToDisposeRemovedContent());
perform(context, content[0]);
}
public static boolean isEnabled(ViewContext context, Content[] content, String place) {
public static boolean perform(ViewContext context, Content content) {
return context.getContentManager().removeContent(content, context.isToDisposeRemovedContent());
}
public static boolean isEnabled(Content[] content) {
return content.length == 1 && content[0].isCloseable();
}
platform/lang-impl/src/com/intellij/execution/ui/layout/impl/RunnerContentUi.java
+15
View File
@@ -18,6 +18,7 @@ package com.intellij.execution.ui.layout.impl;
import com.intellij.execution.ui.RunnerLayoutUi;
import com.intellij.execution.ui.layout.*;
import com.intellij.execution.ui.layout.actions.CloseViewAction;
import com.intellij.execution.ui.layout.actions.RestoreViewAction;
import com.intellij.ide.DataManager;
import com.intellij.openapi.Disposable;
@@ -56,6 +57,7 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import javax.swing.border.EmptyBorder;
import java.awt.*;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
@@ -236,6 +238,19 @@ public class RunnerContentUi implements ContentUI, Disposable, CellTransform.Fac
}
}
});
myTabs.addTabMouseListener(new MouseAdapter() {
@Override
public void mousePressed(MouseEvent e) {
if (UIUtil.isCloseClick(e)) {
final TabInfo tabInfo = myTabs.findInfo(e);
final GridImpl grid = getGridFor(tabInfo);
final Content[] contents = grid != null ? CONTENT_KEY.getData(grid) : null;
if (contents != null && CloseViewAction.isEnabled(contents)) {
CloseViewAction.perform(RunnerContentUi.this, contents[0]);
}
}
}
});
if (myOriginal != null) {
final ContentManager manager = ContentFactory.SERVICE.getInstance().createContentManager(this, false, myProject);
platform/lang-impl/src/com/intellij/ide/actions/ViewStructureAction.java
+1 -1
View File
@@ -90,7 +90,7 @@ public class ViewStructureAction extends AnAction {
}
@Nullable
private static FileStructurePopup createPopup(final Editor editor, Project project, Navigatable navigatable, final FileEditor fileEditor) {
public static FileStructurePopup createPopup(final Editor editor, Project project, @Nullable Navigatable navigatable, final FileEditor fileEditor) {
final StructureViewBuilder structureViewBuilder = fileEditor.getStructureViewBuilder();
if (structureViewBuilder == null) return null;
StructureView structureView = structureViewBuilder.createStructureView(fileEditor, project);
platform/lang-impl/src/com/intellij/ide/util/FileStructurePopup.java
+54 -31
View File
@@ -149,6 +149,7 @@ public class FileStructurePopup implements Disposable {
myTree = new JBTreeWithHintProvider(new DefaultMutableTreeNode(myTreeStructure.getRootElement())) {
@Override
protected PsiElement getPsiElementForHint(Object selectedValue) {
//noinspection ConstantConditions
return getPsi((FilteringTreeStructure.FilteringNode)((DefaultMutableTreeNode)selectedValue).getUserObject());
}
};
@@ -218,12 +219,13 @@ public class FileStructurePopup implements Disposable {
return current.isEmpty() ? null : findClosestTo(myInitialPsiElement, current);
}
@Nullable
private Object findClosestTo(PsiElement path, ArrayList<ObjectWithWeight> paths) {
if (path == null || myInitialPsiElement == null) {
return paths.get(0).node;
}
final Set<PsiElement> parents = getAllParents(myInitialPsiElement);
Object cur = paths.get(0).node;
ArrayList<TreePath> cur = new ArrayList<TreePath>();
int max = -1;
for (ObjectWithWeight p : paths) {
final Object last = ((TreePath)p.node).getLastPathComponent();
@@ -238,14 +240,21 @@ public class FileStructurePopup implements Disposable {
final int size = ContainerUtil.intersection(parents, elements).size();
if (size > max) {
max = size;
cur = p.node;
} else if (size == max && size == parents.size()) {
cur = p.node;
cur.clear();
cur.add((TreePath)p.node);
} else if (size == max) {
cur.add((TreePath)p.node);
}
}
}
return cur;
Collections.sort(cur, new Comparator<TreePath>() {
@Override
public int compare(TreePath o1, TreePath o2) {
return o2.getPathCount() - o1.getPathCount();
}
});
return cur.isEmpty() ? null : cur.get(0);
}
class ObjectWithWeight {
@@ -285,7 +294,7 @@ public class FileStructurePopup implements Disposable {
mySpeedSearch.setComparator(new SpeedSearchComparator(false, true));
final FileStructurePopupFilter filter = new FileStructurePopupFilter();
myFilteringStructure = new FilteringTreeStructure(filter, myTreeStructure, false);
myFilteringStructure = new FilteringTreeStructure(filter, myTreeStructure, ApplicationManager.getApplication().isUnitTestMode());
myAbstractTreeBuilder = new FilteringTreeBuilder(myTree, filter, myFilteringStructure, null) {
@Override
protected boolean validateNode(Object child) {
@@ -385,35 +394,37 @@ public class FileStructurePopup implements Disposable {
});
}
});
final Alarm alarm = new Alarm(Alarm.ThreadToUse.SHARED_THREAD, myPopup);
alarm.addRequest(new Runnable() {
String filter = "";
if (!ApplicationManager.getApplication().isUnitTestMode()) {
final Alarm alarm = new Alarm(Alarm.ThreadToUse.SHARED_THREAD, myPopup);
alarm.addRequest(new Runnable() {
String filter = "";
@Override
public void run() {
alarm.cancelAllRequests();
String prefix = mySpeedSearch.getEnteredPrefix();
myTree.getEmptyText().setText(StringUtil.isEmpty(prefix) ? "Nothing to show" : "Can't find '" + prefix + "'");
if (prefix == null) prefix = "";
@Override
public void run() {
alarm.cancelAllRequests();
String prefix = mySpeedSearch.getEnteredPrefix();
myTree.getEmptyText().setText(StringUtil.isEmpty(prefix) ? "Nothing to show" : "Can't find '" + prefix + "'");
if (prefix == null) prefix = "";
if (!filter.equals(prefix)) {
filter = prefix;
myAbstractTreeBuilder.refilter(null, false, false).doWhenProcessed(new Runnable() {
@Override
public void run() {
myTree.repaint();
//if (mySpeedSearch.isPopupActive()) {
// mySpeedSearch.refreshSelection();
//}
}
});
if (!filter.equals(prefix)) {
filter = prefix;
myAbstractTreeBuilder.refilter(null, false, false).doWhenProcessed(new Runnable() {
@Override
public void run() {
myTree.repaint();
//if (mySpeedSearch.isPopupActive()) {
// mySpeedSearch.refreshSelection();
//}
}
});
}
alarm.addRequest(this, 300);
}
alarm.addRequest(this, 300);
}
}, 300);
}, 300);
}
}
private void selectPsiElement(PsiElement element) {
public void selectPsiElement(PsiElement element) {
Set<PsiElement> parents = getAllParents(element);
FilteringTreeStructure.FilteringNode node = (FilteringTreeStructure.FilteringNode)myAbstractTreeBuilder.getRootElement();
@@ -478,7 +489,7 @@ public class FileStructurePopup implements Disposable {
}
@Nullable
protected PsiElement getCurrentElement(@Nullable final PsiFile psiFile) {
public PsiElement getCurrentElement(@Nullable final PsiFile psiFile) {
if (psiFile == null) return null;
PsiDocumentManager.getInstance(myProject).commitAllDocuments();
@@ -718,6 +729,18 @@ public class FileStructurePopup implements Disposable {
myTitle = title;
}
public Tree getTree() {
return myTree;
}
public TreeSpeedSearch getSpeedSearch() {
return mySpeedSearch;
}
public FilteringTreeBuilder getTreeBuilder() {
return myAbstractTreeBuilder;
}
private class FileStructurePopupFilter implements ElementFilter {
private String myLastFilter = null;
private HashSet<Object> myVisibleParents = new HashSet<Object>();
platform/lang-impl/src/com/intellij/psi/impl/source/tree/injected/InjectedLanguageUtil.java
+2
View File
@@ -132,6 +132,8 @@ public class InjectedLanguageUtil {
if (file == null || !file.isPhysical() && file.getOriginalFile() == file) return;
}
if (containingFile.getViewProvider() instanceof InjectedFileViewProvider) return; // no injection inside injection
PsiElement inTree = loadTree(host, containingFile);
if (inTree != host) {
host = inTree;
platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java
+13 -5
View File
@@ -2362,7 +2362,7 @@ public class AbstractTreeUi {
final ActionCallback done = new ActionCallback();
invokeLaterIfNeeded(new Runnable() {
final Runnable cancelUpdate = new Runnable() {
public void run() {
if (isReleased()) {
done.setRejected();
@@ -2371,21 +2371,29 @@ public class AbstractTreeUi {
if (myResettingToReadyNow.get()) {
_getReady().notify(done);
} else if (isReady()) {
}
else if (isReady()) {
resetToReadyNow();
done.setDone();
} else {
}
else {
if (isIdle() && hasPendingWork()) {
resetToReadyNow();
done.setDone();
} else {
}
else {
_getReady().notify(done);
}
}
maybeReady();
}
}, false);
};
if (ApplicationManager.getApplication().isUnitTestMode()) {
cancelUpdate.run();
} else {
invokeLaterIfNeeded(cancelUpdate, false);
}
if (isEdt() || isPassthroughMode()) {
maybeReady();
platform/platform-api/src/com/intellij/ui/treeStructure/filtered/FilteringTreeBuilder.java
+28 -11
View File
@@ -18,6 +18,7 @@ package com.intellij.ui.treeStructure.filtered;
import com.intellij.ide.util.treeView.AbstractTreeBuilder;
import com.intellij.ide.util.treeView.AbstractTreeStructure;
import com.intellij.ide.util.treeView.NodeDescriptor;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.util.ActionCallback;
import com.intellij.openapi.util.Disposer;
import com.intellij.ui.speedSearch.ElementFilter;
@@ -120,7 +121,7 @@ public class FilteringTreeBuilder extends AbstractTreeBuilder {
myRefilterQueue.cancelAllUpdates();
}
final ActionCallback callback = new ActionCallback();
getUi().cancelUpdate().doWhenProcessed(new Runnable() {
final Runnable afterCancelUpdate = new Runnable() {
@Override
public void run() {
if (myRefilterQueue == null || now) {
@@ -145,7 +146,12 @@ public class FilteringTreeBuilder extends AbstractTreeBuilder {
});
}
}
});
};
if (!ApplicationManager.getApplication().isUnitTestMode()) {
getUi().cancelUpdate().doWhenProcessed(afterCancelUpdate);
} else {
afterCancelUpdate.run();
}
return callback;
}
@@ -155,7 +161,7 @@ public class FilteringTreeBuilder extends AbstractTreeBuilder {
final ActionCallback selectionDone = new ActionCallback();
getFilteredStructure().refilter();
queueUpdate().doWhenProcessed(new Runnable() {
final Runnable selectionRunnable = new Runnable() {
public void run() {
revalidateTree();
@@ -173,25 +179,36 @@ public class FilteringTreeBuilder extends AbstractTreeBuilder {
selectionDone.setDone();
}
});
} else {
}
else {
TreeUtil.ensureSelection(myTree);
selectionDone.setDone();
}
} else {
}
else {
selectionDone.setDone();
}
}
});
};
if (!ApplicationManager.getApplication().isUnitTestMode()) {
queueUpdate().doWhenProcessed(selectionRunnable);
} else {
selectionRunnable.run();
}
final ActionCallback result = new ActionCallback();
selectionDone.doWhenDone(new Runnable() {
public void run() {
scrollSelectionToVisible(new Runnable() {
public void run() {
getReady(this).notify(result);
}
}, false);
if (!ApplicationManager.getApplication().isUnitTestMode()) {
scrollSelectionToVisible(new Runnable() {
public void run() {
getReady(this).notify(result);
}
}, false);
} else {
result.setDone();
}
}
}).doWhenRejected(new Runnable() {
@Override
platform/platform-impl/src/com/intellij/internal/statistic/persistence/ApplicationStatisticsPersistenceComponent.java
+2 -1
View File
@@ -19,7 +19,6 @@ package com.intellij.internal.statistic.persistence;
import com.intellij.ide.AppLifecycleListener;
import com.intellij.internal.statistic.AbstractApplicationUsagesCollector;
import com.intellij.internal.statistic.UsagesCollector;
import com.intellij.internal.statistic.beans.ConvertUsagesUtil;
import com.intellij.internal.statistic.beans.GroupDescriptor;
import com.intellij.internal.statistic.beans.UsageDescriptor;
import com.intellij.openapi.application.ApplicationManager;
@@ -29,6 +28,7 @@ import com.intellij.openapi.components.PersistentStateComponent;
import com.intellij.openapi.components.State;
import com.intellij.openapi.components.Storage;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.DumbService;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.project.ProjectManagerListener;
@@ -218,6 +218,7 @@ public class ApplicationStatisticsPersistenceComponent extends ApplicationStatis
}
private static void doPersistProjectUsages(@NotNull Project project) {
if (DumbService.isDumb(project)) return;
for (UsagesCollector usagesCollector : Extensions.getExtensions(UsagesCollector.EP_NAME)) {
if (usagesCollector instanceof AbstractApplicationUsagesCollector) {
((AbstractApplicationUsagesCollector)usagesCollector).persistProjectUsages(project);
platform/testFramework/src/com/intellij/testFramework/FileStructureTestBase.java
+119
View File
@@ -0,0 +1,119 @@
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.testFramework;
import com.intellij.ide.actions.ViewStructureAction;
import com.intellij.ide.util.FileStructurePopup;
import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase;
import com.intellij.ui.TreeSpeedSearch;
import com.intellij.ui.treeStructure.Tree;
import com.intellij.ui.treeStructure.filtered.FilteringTreeBuilder;
import com.intellij.ui.treeStructure.filtered.FilteringTreeStructure;
import com.intellij.util.ui.tree.TreeUtil;
import junit.framework.Assert;
import org.junit.Before;
import java.io.File;
/**
* @author Konstantin Bulenkov
*/
public abstract class FileStructureTestBase extends CodeInsightFixtureTestCase {
FileStructurePopup myPopup;
@Before
public void setUp() throws Exception {
super.setUp();
myFixture.configureByFile(getFileName(getFileExtension()));
myPopup = ViewStructureAction.createPopup(myFixture.getEditor(),
myFixture.getProject(),
null,
TextEditorProvider.getInstance().getTextEditor(myFixture.getEditor()));
update();
}
protected abstract String getFileExtension();
@Override
public void tearDown() throws Exception {
Disposer.dispose(myPopup);
super.tearDown();
}
private String getFileName(String ext) {
return getTestName(false) + (StringUtil.isEmpty(ext) ? "" : "." + ext);
}
protected String getTreeFileName() {
return getFileName("tree");
}
protected void checkTree() throws Exception {
final String expected = FileUtil.loadFile(new File(getTestDataPath() + "/" + getTreeFileName()));
Assert.assertEquals(expected, PlatformTestUtil.print(getTree(), true));
}
private void update() throws InterruptedException {
myPopup.getTreeBuilder().refilter().doWhenProcessed(new Runnable() {
@Override
public void run() {
getStructure().rebuild();
updateTree();
TreeUtil.expandAll(getTree());
myPopup.selectPsiElement(getFile());
}
});
}
protected Tree getTree() {
return myPopup.getTree();
}
protected FilteringTreeBuilder getBuilder() {
return myPopup.getTreeBuilder();
}
protected TreeSpeedSearch getSpeedSearch() {
return myPopup.getSpeedSearch();
}
protected void updateTree() {
updateRecursively(getRootNode());
}
protected FilteringTreeStructure getStructure() {
final FilteringTreeStructure structure = (FilteringTreeStructure)getBuilder().getTreeStructure();
assert structure != null;
return structure;
}
protected FilteringTreeStructure.FilteringNode getRootNode() {
return (FilteringTreeStructure.FilteringNode)getStructure().getRootElement();
}
protected void updateRecursively(final FilteringTreeStructure.FilteringNode node) {
node.update();
for (FilteringTreeStructure.FilteringNode child : node.children()) {
updateRecursively(child);
}
}
}
platform/util/src/com/intellij/util/io/PagedFileStorage.java
+1 -1
View File
@@ -49,7 +49,7 @@ public class PagedFileStorage implements Forceable {
static {
final int lower = 100;
final int upper = SystemInfo.is64Bit ? 500 : 200;
final int upper = SystemInfo.is64Bit && !PersistentEnumeratorDelegate.useBtree() ? 500 : 200;
BUFFER_SIZE = Math.max(1, SystemInfo.getIntProperty("idea.paged.storage.page.size", 10)) * MB;
if (ByteBufferWrapper.NO_MMAP) {
platform/util/src/com/intellij/util/io/PersistentEnumeratorDelegate.java
+1 -2
View File
@@ -16,7 +16,6 @@
package com.intellij.util.io;
import com.intellij.openapi.Forceable;
import com.intellij.openapi.util.SystemInfo;
import org.jetbrains.annotations.Nullable;
import java.io.Closeable;
@@ -32,7 +31,7 @@ public class PersistentEnumeratorDelegate<Data> implements Closeable, Forceable
new PersistentEnumerator<Data>(file, dataDescriptor, initialSize);
}
private boolean useBtree() {
static boolean useBtree() {
String property = System.getProperty("idea.use.btree");
return !"false".equals(property);
}
platform/vcs-api/src/com/intellij/openapi/vcs/persistent/SmallMapSerializer.java
+3 -1
View File
@@ -20,7 +20,9 @@ import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.util.io.BufferExposingByteArrayOutputStream;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.io.DataExternalizer;
import com.intellij.util.io.DataOutputStream;
import com.intellij.util.io.KeyDescriptor;
import com.intellij.util.io.UnsyncByteArrayInputStream;
import org.jetbrains.annotations.NotNull;
import java.io.*;
@@ -51,7 +53,7 @@ public class SmallMapSerializer<K,V> implements Forceable {
private void init() {
try {
final byte[] bytes = FileUtil.loadFileBytes(myFile);
final DataInputStream dis = new DataInputStream(new ByteArrayInputStream(bytes));
final DataInputStream dis = new DataInputStream(new UnsyncByteArrayInputStream(bytes));
final int size = dis.readInt();
for (int i = 0; i < size; i++) {
final KeyWrapper<K> keyWrapper = new KeyWrapper<K>(myKeyDescriptor, myKeyDescriptor.read(dis));
plugins/InspectionGadgets/src/com/siyeh/ig/style/StringBufferReplaceableByStringInspection.java
+28 -17
View File
@@ -66,7 +66,8 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection {
public String getName() {
if (isStringBuilder) {
return InspectionGadgetsBundle.message("string.builder.replaceable.by.string.quickfix");
} else {
}
else {
return InspectionGadgetsBundle.message("string.buffer.replaceable.by.string.quickfix");
}
}
@@ -110,20 +111,16 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection {
final PsiNewExpression newExpression = (PsiNewExpression)initializer;
final PsiExpressionList argumentList = newExpression.getArgumentList();
final PsiExpression[] arguments = argumentList.getExpressions();
if (arguments.length == 0) {
result.append("\"\"");
} else if (arguments.length == 1) {
if (arguments.length == 1) {
final PsiExpression argument = arguments[0];
final PsiType type = argument.getType();
if (PsiType.INT.equals(type)) {
result.append("\"\"");
} else {
if (!PsiType.INT.equals(type)) {
result.append(argument.getText());
}
} else {
return null;
}
} else if (initializer instanceof PsiMethodCallExpression) {
return result;
}
else if (initializer instanceof PsiMethodCallExpression) {
final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)initializer;
final PsiReferenceExpression methodExpression = methodCallExpression.getMethodExpression();
final PsiExpression qualifier = methodExpression.getQualifierExpression();
@@ -131,20 +128,34 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection {
if (result == null) {
return null;
}
if (!"toString".equals(methodExpression.getReferenceName())) {
if ("toString".equals(methodExpression.getReferenceName())) {
if (result.length() == 0) {
result.append("\"\"");
}
}
else {
final PsiExpressionList argumentList = methodCallExpression.getArgumentList();
final PsiExpression[] arguments = argumentList.getExpressions();
if (arguments.length != 1) {
return null;
}
final PsiExpression argument = arguments[0];
result.append('+');
result.append(argument.getText());
if (result.length() != 0) {
result.append('+').append(argument.getText());
}
else {
final PsiType type = argument.getType();
if (type instanceof PsiPrimitiveType) {
result.append("String.valueOf(").append(argument.getText()).append(")");
}
else {
result.append(argument.getText());
}
}
}
} else {
return null;
return result;
}
return result;
return null;
}
}
@@ -261,7 +272,7 @@ public class StringBufferReplaceableByStringInspection extends BaseInspection {
}
completeExpression = grandParent;
if (found) {
return (PsiExpression) completeExpression;
return (PsiExpression)completeExpression;
}
}
return null;
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/SimpleStringBuffer.after.java
+7
View File
@@ -0,0 +1,7 @@
package com.siyeh.igfixes.style.replace_with_string;
public class SimpleStringBuffer {
String foo() {
return "";
}
}
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/SimpleStringBuffer.java
+7
View File
@@ -0,0 +1,7 @@
package com.siyeh.igfixes.style.replace_with_string;
public class SimpleStringBuffer {
String foo() {
return new <caret>StringBuffer().toString();
}
}
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StartsWithPrimitive.after.java
+6
View File
@@ -0,0 +1,6 @@
class StartsWithPrimitive {
String foo(int i) {
return String.valueOf(i);
}
}
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StartsWithPrimitive.java
+6
View File
@@ -0,0 +1,6 @@
class StartsWithPrimitive {
String foo(int i) {
return new Stri<caret>ngBuffer().append(i).toString();
}
}
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBufferVariable.after.java
+6
View File
@@ -0,0 +1,6 @@
class StringBufferVariable {
void foo() {
String sb = "asdf" + "asdf";
System.out.println(sb.toString());
}
}
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBufferVariable.java
+6
View File
@@ -0,0 +1,6 @@
class StringBufferVariable {
void foo() {
StringBuffer <caret>sb = new StringBuffer("asdf").append("asdf");
System.out.println(sb.toString());
}
}
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBuilderAppend.after.java
+5
View File
@@ -0,0 +1,5 @@
class StringBuilderAppend {
String foo(int i) {
return "test: " + i;
}
}
plugins/InspectionGadgets/test/com/siyeh/igfixes/style/replace_with_string/StringBuilderAppend.java
+5
View File
@@ -0,0 +1,5 @@
class StringBuilderAppend {
String foo(int i) {
return new Strin<caret>gBuilder().append("test: ").append(i).toString();
}
}
plugins/InspectionGadgets/testsrc/com/siyeh/ig/fixes/style/StringBufferReplaceableWithStringFixTest.java
+36
View File
@@ -0,0 +1,36 @@
/*
* Copyright 2012 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.ig.fixes.style;
import com.siyeh.InspectionGadgetsBundle;
import com.siyeh.ig.IGQuickFixesTestCase;
import com.siyeh.ig.style.StringBufferReplaceableByStringInspection;
public class StringBufferReplaceableWithStringFixTest extends IGQuickFixesTestCase {
@Override
public void setUp() throws Exception {
super.setUp();
myFixture.enableInspections(new StringBufferReplaceableByStringInspection());
myRelativePath = "style/replace_with_string";
myDefaultHint = InspectionGadgetsBundle.message("string.buffer.replaceable.by.string.quickfix");
}
public void testSimpleStringBuffer() { doTest(); }
public void testStringBuilderAppend() { doTest("StringBuilderAppend", InspectionGadgetsBundle.message("string.builder.replaceable.by.string.quickfix")); }
public void testStringBufferVariable() { doTest(); }
public void testStartsWithPrimitive() { doTest(); }
}
plugins/git4idea/src/git4idea/history/browser/CherryPicker.java
+1 -2
View File
@@ -148,8 +148,7 @@ public class CherryPicker {
final Collection<FilePath> paths = ChangesUtil.getPaths(changes);
String message = ce.getDefaultMessageFor(paths.toArray(new FilePath[paths.size()]));
message = (message == null) ? new StringBuilder().append(commit.getDescription()).append("(cherry picked from commit ")
.append(commit.getShortHash()).append(")").toString() : message;
message = (message == null) ? commit.getDescription() + " (cherry picked from commit " + commit.getShortHash() + ")" : message;
myMessagesInOrder.add(message);
myFilesToMove.put(message, paths);