();
- final JRootPane pane = getRootPane();
- if (pane != null) {
- try {
- Runnable run = new Runnable() {
- @Override
- public void run() {
- ID synchronizer_ = Foundation.getClass("ClipboardSynchronizer_");
- final ID synchronizer = Foundation.invoke(Foundation.invoke(synchronizer_, "alloc"), "init");
- Foundation
- .invoke(synchronizer, "performSelectorOnMainThread:withObject:waitUntilDone:", Foundation.createSelector("run:"), null,
- false);
-
- pane.putClientProperty(MAC_CLIPBOARD_SYNC_ACTIVE, Boolean.TRUE);
- MacUtil.startModal(pane, MAC_CLIPBOARD_SYNC_ACTIVE);
-
- Foundation.cfRelease(synchronizer);
-
- Object contents = pane.getClientProperty(CLIPBOARD_CONTENTS);
- pane.putClientProperty(CLIPBOARD_CONTENTS, null);
- if (contents != null) {
- result.set((Transferable)contents);
- }
- }
- };
-
- if (SwingUtilities.isEventDispatchThread()) {
- run.run();
- } else {
- SwingUtilities.invokeAndWait(run);
- }
-
- Transferable transferable = result.get();
- if (transferable != null) return transferable;
- }
- catch (InterruptedException e) {
- // do nothing
- }
- catch (InvocationTargetException e) {
- // do nothing
+
+ Foundation.executeOnMainThread(new Runnable() {
+ @Override
+ public void run() {
+ Transferable transferable = getClipboardContentNatively();
+ if (transferable != null) {
+ result.set(transferable);
}
}
-
- return null;
+ }, true, true);
+
+ return result.get();
}
}
diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java
index 2fc467d8b923..54e5abbb9aab 100644
--- a/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/ShowFilePathAction.java
@@ -15,6 +15,7 @@
*/
package com.intellij.ide.actions;
+import com.intellij.CommonBundle;
import com.intellij.execution.ExecutionException;
import com.intellij.execution.configurations.GeneralCommandLine;
import com.intellij.execution.util.ExecUtil;
@@ -28,6 +29,7 @@ import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.impl.LaterInvocator;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.DialogWrapper;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.ListPopup;
@@ -234,10 +236,46 @@ public class ShowFilePathAction extends AnAction {
return PlatformDataKeys.VIRTUAL_FILE.getData(e.getDataContext());
}
- public static void showDialog(Project project, String message, String title, File file) {
+ public static Boolean showDialog(Project project, String message, String title, File file) {
+ final Boolean[] ref = new Boolean[1];
+ final DialogWrapper.DoNotAskOption option = new DialogWrapper.DoNotAskOption() {
+ @Override
+ public boolean isToBeShown() {
+ return true;
+ }
+
+ @Override
+ public void setToBeShown(boolean value, int exitCode) {
+ if (!value) {
+ if (exitCode == 0) {
+ // yes
+ ref[0] = true;
+ }
+ else {
+ ref[0] = false;
+ }
+ }
+ }
+
+ @Override
+ public boolean canBeHidden() {
+ return true;
+ }
+
+ @Override
+ public boolean shouldSaveOptionsOnCancel() {
+ return true;
+ }
+
+ @Override
+ public String getDoNotShowMessage() {
+ return CommonBundle.message("dialog.options.do.not.ask");
+ }
+ };
if (Messages.showOkCancelDialog(project, message, title, RevealFileAction.getActionName(),
- IdeBundle.message("action.close"), Messages.getInformationIcon()) == 0) {
+ IdeBundle.message("action.close"), Messages.getInformationIcon(), option) == 0) {
open(file, file);
}
+ return ref[0];
}
}
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java
index 13cafcc0a946..403cd4370b65 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/EditorActionUtil.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2011 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.
@@ -170,7 +170,7 @@ public class EditorActionUtil {
}
}
- editor.getCaretModel().moveToOffset(newCaretOffset);
+ editor.getCaretModel().moveToOffset(Math.min(document.getTextLength(), newCaretOffset));
}
private static boolean shouldUseSmartTabs(Project project, Editor editor) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
index b1276690d020..6560ad8b1cdd 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/CaretModelImpl.java
@@ -24,6 +24,7 @@
*/
package com.intellij.openapi.editor.impl;
+import com.intellij.diagnostic.LogMessageEx;
import com.intellij.openapi.Disposable;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
@@ -69,6 +70,25 @@ public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener,
private RangeMarker savedBeforeBulkCaretMarker;
private boolean ignoreWrongMoves = false;
+ /**
+ * We check that caret is located at the target offset at the end of {@link #moveToOffset(int, boolean)} method. However,
+ * it's possible that the following situation occurs:
+ *
+ *
+ *
+ * - Some client subscribes to caret change events;
+ * - {@link #moveToLogicalPosition(LogicalPosition)} is called;
+ * - Caret position is changed during {@link #moveToLogicalPosition(LogicalPosition)} processing;
+ * - The client receives caret position change event and adjusts the position;
+ * - {@link #moveToLogicalPosition(LogicalPosition)} processing is finished;
+ * - {@link #moveToLogicalPosition(LogicalPosition)} reports an error because the caret is not located at the target offset;
+ *
+ *
+ *
+ * This field serves as a flag that reports unexpected caret position change requests nested from {@link #moveToOffset(int, boolean)}.
+ */
+ private boolean myReportCaretMoves;
+
/**
* There is a possible case that user defined non-monospaced font for editor. That means that various symbols have different
* visual widths. That means that if we move caret vertically it may deviate to the left/right. However, we can try to preserve
@@ -116,6 +136,9 @@ public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener,
public void moveToVisualPosition(@NotNull VisualPosition pos) {
assertIsDispatchThread();
validateCallContext();
+ if (myReportCaretMoves) {
+ LogMessageEx.error(LOG, "Unexpected caret move request");
+ }
myDesiredX = -1;
int column = pos.column;
int line = pos.line;
@@ -218,6 +241,9 @@ public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener,
boolean scrollToCaret)
{
assertIsDispatchThread();
+ if (myReportCaretMoves) {
+ LogMessageEx.error(LOG, "Unexpected caret move request");
+ }
SelectionModel selectionModel = myEditor.getSelectionModel();
int selectionStart = selectionModel.getLeadSelectionOffset();
LogicalPosition blockSelectionStart = selectionModel.hasBlockSelection()
@@ -366,6 +392,19 @@ public class CaretModelImpl implements CaretModel, PrioritizedDocumentListener,
}
private void moveToLogicalPosition(@NotNull LogicalPosition pos, boolean locateBeforeSoftWrap, @Nullable StringBuilder debugBuffer) {
+ if (myReportCaretMoves) {
+ LogMessageEx.error(LOG, "Unexpected caret move request");
+ }
+ myReportCaretMoves = true;
+ try {
+ doMoveToLogicalPosition(pos, locateBeforeSoftWrap, debugBuffer);
+ }
+ finally {
+ myReportCaretMoves = false;
+ }
+ }
+
+ private void doMoveToLogicalPosition(@NotNull LogicalPosition pos, boolean locateBeforeSoftWrap, @Nullable StringBuilder debugBuffer) {
assertIsDispatchThread();
if (debugBuffer != null) {
debugBuffer.append(String.format(
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
index 98f8edf25419..2f83e2241f10 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
@@ -22,6 +22,7 @@ import com.intellij.codeInsight.hint.EditorFragmentComponent;
import com.intellij.codeInsight.hint.TooltipController;
import com.intellij.codeInsight.hint.TooltipGroup;
import com.intellij.concurrency.JobScheduler;
+import com.intellij.diagnostic.LogMessageEx;
import com.intellij.ide.*;
import com.intellij.ide.dnd.DnDManager;
import com.intellij.openapi.actionSystem.ActionManager;
@@ -320,8 +321,8 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
public void attributesChanged(@NotNull RangeHighlighterEx highlighter) {
int textLength = myDocument.getTextLength();
- int start = Math.min(Math.max(highlighter.getAffectedAreaStartOffset(), 0), textLength - 1);
- int end = Math.min(Math.max(highlighter.getAffectedAreaEndOffset(), 0), textLength - 1);
+ int start = Math.min(Math.max(highlighter.getAffectedAreaStartOffset(), 0), textLength);
+ int end = Math.min(Math.max(highlighter.getAffectedAreaEndOffset(), 0), textLength);
int startLine = start == -1 ? 0 : myDocument.getLineNumber(start);
int endLine = end == -1 ? myDocument.getLineCount() : myDocument.getLineNumber(end);
@@ -3233,10 +3234,10 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
return logicalToVisualPosition(logicalPos, true);
}
- // TODO den remove before v.11 is released.
+ // TODO den remove as soon as the problem is fixed.
private final ThreadLocal stackDepth = new ThreadLocal();
- // TODO den remove before v.11 is released.
+ // TODO den remove as soon as the problem is fixed.
@Override
@NotNull
public VisualPosition logicalToVisualPosition(@NotNull LogicalPosition logicalPos, boolean softWrapAware) {
@@ -3257,7 +3258,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
if (offset < getDocument().getTextLength()) {
offset = outermostCollapsed.getStartOffset();
LogicalPosition foldStart = offsetToLogicalPosition(offset);
- // TODO den remove before v.11 is released.
+ // TODO den remove as soon as the problem is fixed.
Integer depth = stackDepth.get();
if (depth >= 0) {
stackDepth.set(depth + 1);
@@ -3269,7 +3270,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
stackDepth.set(-1);
}
}
- // TODO den unwrap before v.11 is released.
+ // TODO den remove as soon as the problem is fixed.
try {
return doLogicalToVisualPosition(foldStart, true);
}
@@ -3507,6 +3508,9 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
if (newY > 0 && newY == y) {
newY = visibleLineToY(getVisibleLogicalLinesCount());
}
+ if (newY >= y) {
+ LogMessageEx.error(LOG, "cycled moveCaretToScreenPos() detected", String.format("x=%d, y=%d%nstate=%s", x, y, dumpState()));
+ }
moveCaretToScreenPos(x, newY);
return;
}
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
index af3064934e2d..698ddff7dabd 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
@@ -854,14 +854,14 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
}
int endY;
+ int endLineNumber = offsetToLine(end, document);
if (end == -1 || start == -1) {
endY = Math.min(myEditorSourceHeight, myEditorTargetHeight);
}
- else if (start == end || document.getLineNumber(start) == document.getLineNumber(end)) {
+ else if (start == end || offsetToLine(start,document) == endLineNumber) {
endY = startY; // both offsets are on the same line, no need to recalc Y position
}
else {
- int endLineNumber = offsetToLine(end, document);
if (myEditorSourceHeight < myEditorTargetHeight) {
endY = myEditorScrollbarTop + endLineNumber * myEditor.getLineHeight();
}
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/IterationState.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/IterationState.java
index 44250317f389..0aa4b4666b5b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/IterationState.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/IterationState.java
@@ -541,6 +541,7 @@ public final class IterationState {
}
public void pushBack(T element) {
+ assert myPushedBack == null : "Pushed already: " + myPushedBack;
myPushedBack = element;
}
}
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java
index e7916cc79493..84a4de25a325 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java
@@ -211,7 +211,7 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedDocumentLi
@Override
public boolean isRespectAdditionalColumns() {
- return myForceAdditionalColumns || myApplianceManager.hasLinesWithFailedWrap();
+ return myForceAdditionalColumns || !isSoftWrappingEnabled() || myApplianceManager.hasLinesWithFailedWrap();
}
@Override
@@ -665,6 +665,7 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedDocumentLi
myDataMapper.release();
myApplianceManager.reset();
myStorage.removeAll();
+ myApplianceManager.recalculateIfNecessary();
try {
task.run(true);
}
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/AbstractMappingStrategy.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/AbstractMappingStrategy.java
index 2eef57fc2ef5..cb7fd4cf07d6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/AbstractMappingStrategy.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/AbstractMappingStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2011 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.
@@ -15,10 +15,13 @@
*/
package com.intellij.openapi.editor.impl.softwrap.mapping;
+import com.intellij.diagnostic.LogMessageEx;
+import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.editor.FoldRegion;
import com.intellij.openapi.editor.LogicalPosition;
+import com.intellij.openapi.editor.impl.EditorImpl;
import com.intellij.openapi.editor.impl.EditorTextRepresentationHelper;
import com.intellij.openapi.editor.impl.softwrap.SoftWrapsStorage;
import org.jetbrains.annotations.NotNull;
@@ -37,7 +40,9 @@ import java.util.List;
* @param resulting document dimension type
*/
abstract class AbstractMappingStrategy implements MappingStrategy {
-
+
+ private static final Logger LOG = Logger.getInstance("#" + AbstractMappingStrategy.class.getName());
+
protected static final CacheEntry SEARCH_KEY = new CacheEntry(0, null, null, null);
protected final Editor myEditor;
@@ -121,7 +126,7 @@ abstract class AbstractMappingStrategy implements MappingStrategy {
}
@Override
- public T advance(EditorPosition position, int offset) {
+ public T advance(@NotNull EditorPosition position, int offset) {
Document document = myEditor.getDocument();
if (offset >= myLastEntryOffset || offset >= document.getTextLength()) {
return build(position);
@@ -155,7 +160,7 @@ abstract class AbstractMappingStrategy implements MappingStrategy {
protected abstract T buildIfExceeds(EditorPosition position, int offset);
@Override
- public T processFoldRegion(EditorPosition position, @NotNull FoldRegion foldRegion) {
+ public T processFoldRegion(@NotNull EditorPosition position, @NotNull FoldRegion foldRegion) {
T result = buildIfExceeds(position, foldRegion);
if (result != null) {
return result;
@@ -171,7 +176,11 @@ abstract class AbstractMappingStrategy implements MappingStrategy {
collapsedSymbolsWidthInColumns = foldingData.getCollapsedSymbolsWidthInColumns();
}
else {
- assert false : String.format("Problem fold region: %s. Soft wraps cache: %s", foldRegion, myCache);
+ String details = "";
+ if (myEditor instanceof EditorImpl) {
+ details = ((EditorImpl)myEditor).dumpState();
+ }
+ LogMessageEx.error(LOG, "Unexpected fold region is found: " + foldRegion, details);
}
}
else {
@@ -195,7 +204,7 @@ abstract class AbstractMappingStrategy implements MappingStrategy {
protected abstract T buildIfExceeds(@NotNull EditorPosition context, @NotNull FoldRegion foldRegion);
@Override
- public T processTabulation(EditorPosition position, TabData tabData) {
+ public T processTabulation(@NotNull EditorPosition position, TabData tabData) {
T result = buildIfExceeds(position, tabData);
if (result != null) {
return result;
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/LogicalToVisualMappingStrategy.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/LogicalToVisualMappingStrategy.java
index 0010d8a0f213..57f77e5f9fc9 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/LogicalToVisualMappingStrategy.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/LogicalToVisualMappingStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2011 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.
@@ -158,7 +158,7 @@ class LogicalToVisualMappingStrategy extends AbstractMappingStrategy {
* and given offset if any; null otherwise
*/
@Nullable
- T advance(EditorPosition position, int offset);
+ T advance(@NotNull EditorPosition position, int offset);
/**
* Notifies current strategy that soft wrap is encountered during the processing. There are two ways to continue the processing then:
@@ -74,7 +74,7 @@ interface MappingStrategy {
* @return target document dimension if it's located within the bounds of the given soft wrap; null otherwise
*/
@Nullable
- T processSoftWrap(EditorPosition position, SoftWrap softWrap);
+ T processSoftWrap(@NotNull EditorPosition position, SoftWrap softWrap);
/**
* Notifies current strategy that collapsed fold region is encountered during the processing. There are two ways to
@@ -92,7 +92,7 @@ interface MappingStrategy {
* null otherwise
*/
@Nullable
- T processFoldRegion(EditorPosition position, @NotNull FoldRegion foldRegion);
+ T processFoldRegion(@NotNull EditorPosition position, @NotNull FoldRegion foldRegion);
/**
* Notifies current strategy that tabulation symbols is encountered during the processing. Tabulation symbols
@@ -111,7 +111,7 @@ interface MappingStrategy {
* null otherwise
*/
@Nullable
- T processTabulation(EditorPosition position, TabData tabData);
+ T processTabulation(@NotNull EditorPosition position, TabData tabData);
/**
* This method is assumed to be called when there are no special symbols between the document position identified by the
@@ -122,5 +122,5 @@ interface MappingStrategy {
* @return resulting dimension that is built on the basis of the given position and target anchor dimension
*/
@NotNull
- T build(EditorPosition position);
+ T build(@NotNull EditorPosition position);
}
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/OffsetToLogicalCalculationStrategy.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/OffsetToLogicalCalculationStrategy.java
index 1b58428bfff2..7a72b05d1b3c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/OffsetToLogicalCalculationStrategy.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/softwrap/mapping/OffsetToLogicalCalculationStrategy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2011 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.
@@ -195,7 +195,7 @@ class OffsetToLogicalCalculationStrategy extends AbstractMappingStrategy)element.getChildren()) {
+ @SuppressWarnings("unchecked") final List children = (List)element.getChildren();
+ for (Element child : children) {
if (KEY_MAP.equals(child.getName())) {
String keymapName = child.getAttributeValue(NAME_ATTRIBUTE);
DefaultKeymapImpl keymap = keymapName.startsWith(KeymapManager.MAC_OS_X_KEYMAP) ? new MacOSDefaultKeymap() : new DefaultKeymapImpl();
@@ -84,7 +85,15 @@ public class DefaultKeymap {
}
public String getDefaultKeymapName() {
- return SystemInfo.isMac ? KeymapManager.MAC_OS_X_KEYMAP : KeymapManager.DEFAULT_IDEA_KEYMAP;
+ if (SystemInfo.isMac) {
+ return KeymapManager.MAC_OS_X_KEYMAP;
+ }
+ else if (SystemInfo.isLinux) {
+ return KeymapManager.X_WINDOW_KEYMAP;
+ }
+ else {
+ return KeymapManager.DEFAULT_IDEA_KEYMAP;
+ }
}
public String getKeymapPresentableName(KeymapImpl keymap) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java
index d974d2a90ec7..e7906619043a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vfs/newvfs/persistent/FSRecords.java
@@ -190,7 +190,10 @@ public class FSRecords implements Forceable {
myNames = new PersistentStringEnumerator(namesFile);
myAttributes = new Storage(attributesFile.getCanonicalPath());
myContents = new RefCountingStorage(contentsFile.getCanonicalPath());
- myRecords = new ResizeableMappedFile(recordsFile, 20 * 1024, new PagedFileStorage.StorageLock(false));
+ boolean aligned = PagedFileStorage.BUFFER_SIZE % RECORD_SIZE == 0;
+ assert aligned; // for performance
+ myRecords = new ResizeableMappedFile(recordsFile, 20 * 1024, new PagedFileStorage.StorageLock(false),
+ PagedFileStorage.BUFFER_SIZE, aligned);
if (myRecords.length() == 0) {
cleanRecord(0); // Clean header
diff --git a/platform/platform-resources-en/src/messages/ActionsBundle.properties b/platform/platform-resources-en/src/messages/ActionsBundle.properties
index 0622dc768fba..6a54304b2fc4 100644
--- a/platform/platform-resources-en/src/messages/ActionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/ActionsBundle.properties
@@ -514,7 +514,7 @@ action.CloneElement.text=Clo_ne...
action.CloneElement.description=Create a copy of the selected class, file or directory in the same package/directory
action.SafeDelete.text=Safe _Delete...
action.SafeDelete.description=Delete the selected class, method or field, checking for usages
-action.ExtractMethod.text=E_xtract Method...
+action.ExtractMethod.text=_Method...
action.ExtractMethod.description=Turn the selected code fragment into a method
action.RemoveMiddleman.text=Remove _Middleman...
action.RemoveMiddleman.description=Get the client to call the delegate directly
@@ -522,25 +522,25 @@ action.MethodDuplicates.text=Replace Met_hod Code Duplicates...
action.MethodDuplicates.description=Finds code in current file that can be transformed into a call of selected method
action.InvertBoolean.text=Invert _Boolean...
action.InvertBoolean.description=Makes the method return or variable contain the opposite value and corrects the references
-action.IntroduceParameterObject.text=Introduce Parameter Ob_ject...
+action.IntroduceParameterObject.text=Parameter Ob_ject...
action.IntroduceParameterObject.description=Replaces method parameters list with object
-action.ExtractClass.text=Extract Cla_ss...
+action.ExtractClass.text=Cla_ss...
action.ExtractClass.description=Extract Delegate
-action.IntroduceVariable.text=Introduce _Variable...
+action.IntroduceVariable.text=_Variable...
action.IntroduceVariable.description=Put a result of the selected expression into a variable
-action.IntroduceField.text=Introduce _Field...
+action.IntroduceField.text=_Field...
action.IntroduceField.description=Put a result of the selected expression into a field
-action.IntroduceConstant.text=Introduce _Constant...
+action.IntroduceConstant.text=_Constant...
action.IntroduceConstant.description=Replace selected expression with a constant (static final field)
-action.IntroduceParameter.text=Introduce _Parameter...
+action.IntroduceParameter.text=_Parameter...
action.IntroduceParameter.description=Turn the selected expression into method parameter
-action.ExtractInterface.text=Extract _Interface...
+action.ExtractInterface.text=_Interface...
action.ExtractInterface.description=Extract interface from the selected class
-action.ExtractModule.text=Extract _Module...
+action.ExtractModule.text=_Module...
action.ExtractModule.description=Extract module from the selected class
-action.ExtractSuperclass.text=Extract S_uperclass...
+action.ExtractSuperclass.text=S_uperclass...
action.ExtractSuperclass.description=Extract superclass from the selected class
-group.IntroduceActionsGroup.text=Introd_uce
+group.IntroduceActionsGroup.text=E_xtract
action.TurnRefsToSuper.text=Use Interface _Where Possible...
action.TurnRefsToSuper.description=Change usages of a class to those of its superclass or interface
action.MembersPullUp.text=Pu_ll Members Up...
@@ -559,7 +559,7 @@ action.ReplaceTempWithQuery.text=Replace Temp with _Query...
action.ReplaceTempWithQuery.description=Turn the selected variable into a method
action.ReplaceConstructorWithFactory.text=Replace Constructor with F_actory Method...
action.ReplaceConstructorWithFactory.description=Create a static factory method and use it instead of a constructor
-action.ReplaceMethodWithMethodObject.text=Extract Method Ob_ject...
+action.ReplaceMethodWithMethodObject.text=Method Ob_ject...
action.ReplaceMethodWithMethodObject.description=Turn the method into its own object so that all the parameters become fields on that object
action.Generify.text=Ge_nerify...
action.Generify.description=Convert your code to use generic types
@@ -567,7 +567,7 @@ action.Migrate.text=_Migrate...
action.Migrate.description=Open migration dialog
action.Type\ Migration.text=Type Migration...
action.Type\ Migration.description=Migrate one type to another
-action.ExtractInclude.text=E_xtract Include File...
+action.ExtractInclude.text=_Include File...
action.ExtractInclude.description=Turn the selected code fragment into included file
group.BuildMenu.text=_Build
action.CompileProject.text=_Rebuild Project
diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
index aa4dedba329e..649bcf59210d 100644
--- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
+++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
@@ -281,8 +281,6 @@ templates.dialog.table.column.description=Description
templates.dialog.table.column.active=Active
templates.dialog.shortcut.chooser.label=By default expand with
dialog.copy.live.template.title=Copy Live Template
-template.delete.confirmation.title=Confirm Delete
-template.delete.group.confirmation.text=Do you want to delete this template group?
dialog.edit.template.shortcut.default=Default ({0})
dialog.edit.template.template.text.title=&Template text:
dialog.edit.template.button.edit.variables=&Edit variables
diff --git a/platform/platform-resources-en/src/misc/registry.properties b/platform/platform-resources-en/src/misc/registry.properties
index fd6bb8351f10..8e919fa85bad 100644
--- a/platform/platform-resources-en/src/misc/registry.properties
+++ b/platform/platform-resources-en/src/misc/registry.properties
@@ -153,7 +153,7 @@ dir.diff.default.trg.folder=
show.live.templates.in.completion=false
documentation.component.editor.font=false
-ide.mac.useNativeClipboard=true
+ide.mac.useNativeClipboard=false
show.all.classes.on.first.completion=false
limited.relevance.sorting.in.completion=false
diff --git a/platform/platform-resources/src/codeStyle/preview/preview.xml.template b/platform/platform-resources/src/codeStyle/preview/preview.xml.template
index 85b3d0efc4a5..6edd0817d215 100644
--- a/platform/platform-resources/src/codeStyle/preview/preview.xml.template
+++ b/platform/platform-resources/src/codeStyle/preview/preview.xml.template
@@ -7,9 +7,9 @@
- ReSharper makes C# development a real pleasure. It decreases the time you spend on routine, repetitive
+ Our product makes development a real pleasure. It decreases the time you spend on routine, repetitive
handwork, giving you more time to focus on the task at hand. Its robust set of features for automatic error-checking
- and code correction cuts development time and increases your efficiency. You'll find that ReSharper quickly
+ and code correction cuts development time and increases your efficiency. You'll find that our product quickly
pays back it's cost in increased developer productivity and improved code quality.
diff --git a/platform/testFramework/src/com/intellij/TestAll.java b/platform/testFramework/src/com/intellij/TestAll.java
index e77bde661baa..eec7f36d2478 100644
--- a/platform/testFramework/src/com/intellij/TestAll.java
+++ b/platform/testFramework/src/com/intellij/TestAll.java
@@ -323,7 +323,9 @@ public class TestAll implements Test {
super.addTest(test);
}
else {
- if (isPerformanceTestsRun() ^ (hasPerformance(((TestCase)test).getName()) || hasPerformance(testCaseClass.getSimpleName())))
+ String name = ((TestCase)test).getName();
+ if ("warning".equals(name)) return; // Mute TestSuite's "no tests found" warning
+ if (isPerformanceTestsRun() ^ (hasPerformance(name) || hasPerformance(testCaseClass.getSimpleName())))
return;
Method method = findTestMethod((TestCase)test);
diff --git a/platform/util/src/com/intellij/util/io/PagedFileStorage.java b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
index 4a1a16e79d7f..6a6c14671010 100644
--- a/platform/util/src/com/intellij/util/io/PagedFileStorage.java
+++ b/platform/util/src/com/intellij/util/io/PagedFileStorage.java
@@ -44,7 +44,7 @@ public class PagedFileStorage implements Forceable {
private final static int LOWER_LIMIT;
private final static int UPPER_LIMIT;
- private final static int BUFFER_SIZE;
+ public final static int BUFFER_SIZE;
private static final int UNKNOWN_PAGE = -1;
static {
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
index 29bab41567f2..0030810d4fb5 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
@@ -88,6 +88,7 @@ public final class VcsConfiguration implements PersistentStateComponent
public boolean INCLUDE_TEXT_INTO_PATCH = false;
public boolean INCLUDE_TEXT_INTO_SHELF = false;
public boolean CREATE_PATCH_EXPAND_DETAILS_DEFAULT = true;
+ public Boolean SHOW_PATCH_IN_EXPLORER = null;
public enum StandardOption {
ADD(VcsBundle.message("vcs.command.name.add")),
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java
index f78466cdb69c..2b3edd9df215 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CommittedChangesTreeBrowser.java
@@ -491,6 +491,15 @@ public class CommittedChangesTreeBrowser extends JPanel implements TypeSafeDataP
}
else if (key.equals(PlatformDataKeys.TREE_EXPANDER)) {
sink.put(PlatformDataKeys.TREE_EXPANDER, myTreeExpander);
+ } else {
+ final String name = key.getName();
+ if (VcsDataKeys.SELECTED_CHANGES.is(name) || VcsDataKeys.CHANGES.is(name)
+ || VcsDataKeys.CHANGE_LEAD_SELECTION.is(name) || CommittedChangesBrowserUseCase.DATA_KEY.is(name)) {
+ final Object data = myDetailsView.getData(name);
+ if (data != null) {
+ sink.put(key, data);
+ }
+ }
}
}
}
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java
index 75dfa0e5fd70..9bf5ca0c38e6 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java
@@ -32,6 +32,7 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowser;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.pom.Navigatable;
+import com.intellij.ui.table.TableView;
import org.jetbrains.annotations.NonNls;
import javax.swing.*;
@@ -114,6 +115,8 @@ public class RepositoryChangesBrowser extends ChangesBrowser implements DataProv
if ((! ModalityState.NON_MODAL.equals(ModalityState.current())) ||
CommittedChangesBrowserUseCase.IN_AIR.equals(CommittedChangesBrowserUseCase.DATA_KEY.getData(event.getDataContext()))) {
event.getPresentation().setEnabled(false);
+ } else {
+ event.getPresentation().setEnabled(true);
}
}
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
index 3b26f78c933a..c557a030ab57 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
@@ -16,6 +16,7 @@
package com.intellij.openapi.vcs.changes.patch;
import com.intellij.ide.util.PropertiesComponent;
+import com.intellij.openapi.Disposable;
import com.intellij.openapi.actionSystem.*;
import com.intellij.openapi.diff.impl.patch.PatchReader;
import com.intellij.openapi.diff.impl.patch.PatchSyntaxException;
@@ -32,6 +33,7 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton;
import com.intellij.openapi.ui.popup.JBPopupFactory;
import com.intellij.openapi.ui.popup.PopupStep;
import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
+import com.intellij.openapi.util.Disposer;
import com.intellij.openapi.util.Getter;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.Pair;
@@ -47,8 +49,7 @@ import com.intellij.openapi.vcs.changes.actions.DiffRequestPresentable;
import com.intellij.openapi.vcs.changes.actions.ShowDiffAction;
import com.intellij.openapi.vcs.changes.actions.ShowDiffUIContext;
import com.intellij.openapi.vcs.changes.ui.*;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.*;
import com.intellij.ui.DocumentAdapter;
import com.intellij.ui.SimpleColoredComponent;
import com.intellij.ui.SimpleTextAttributes;
@@ -94,6 +95,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
private JLabel myPatchFileLabel;
private PatchReader myReader;
private CommitContext myCommitContext;
+ private final VirtualFileAdapter myListener;
public ApplyPatchDifferentiatedDialog(final Project project, final ApplyPatchExecutor callback, final List executors,
@NotNull final ApplyPatchMode applyPatchMode, @NotNull final VirtualFile patchFile) {
@@ -163,6 +165,24 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
}
myPatchFileLabel.setVisible(applyPatchMode.isCanChangePatchFile());
myPatchFile.setVisible(applyPatchMode.isCanChangePatchFile());
+
+ myListener = new VirtualFileAdapter() {
+ @Override
+ public void contentsChanged(VirtualFileEvent event) {
+ if (myRecentPathFileChange.get() != null && myRecentPathFileChange.get().getVf() != null &&
+ myRecentPathFileChange.get().getVf().equals(event.getFile())) {
+ myLoadQueue.queue(myUpdater);
+ }
+ }
+ };
+ final VirtualFileManager fileManager = VirtualFileManager.getInstance();
+ fileManager.addVirtualFileListener(myListener);
+ Disposer.register(getDisposable(), new Disposable() {
+ @Override
+ public void dispose() {
+ fileManager.removeVirtualFileListener(myListener);
+ }
+ });
}
public static FileChooserDescriptor createSelectPatchDescriptor() {
@@ -239,7 +259,9 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
}
final VirtualFile file = filePresentation.getVf();
- final PatchReader patchReader = loadPatches(file);
+ final PatchReader patchReader = loadPatches(filePresentation);
+ if (patchReader == null) return;
+
final List matchedPathes = patchReader == null ? Collections.emptyList() :
new AutoMatchIterator(myProject).execute(patchReader.getPatches());
@@ -256,10 +278,13 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
}
@Nullable
- private PatchReader loadPatches(final VirtualFile patchFile) {
+ private PatchReader loadPatches(final FilePresentation filePresentation) {
+ final VirtualFile patchFile = filePresentation.getVf();
+ patchFile.refresh(false, false);
if (! patchFile.isValid()) {
return null;
}
+
PatchReader reader;
try {
reader = PatchVirtualFileReader.create(patchFile);
@@ -344,6 +369,12 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
group.add(new StripDown());
group.add(new ResetStrip());
group.add(new ZeroStrip());
+ group.add(new AnAction("Refresh", "Refresh", IconLoader.getIcon("/actions/sync.png")) {
+ @Override
+ public void actionPerformed(AnActionEvent e) {
+ myLoadQueue.queue(myUpdater);
+ }
+ });
final ActionToolbar toolbar = ActionManager.getInstance().createActionToolbar("APPLY_PATCH", group, true);
myCenterPanel.add(toolbar.getComponent(), gb);
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
index ded368b51aae..09a8d9e8a9e4 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java
@@ -207,7 +207,15 @@ public class CreatePatchCommitExecutor implements CommitExecutorWithHelp, Projec
}
WaitForProgressToShow.runOrInvokeLaterAboveProgress(new Runnable() {
public void run() {
- ShowFilePathAction.showDialog(myProject, message, VcsBundle.message("create.patch.commit.action.title"), file);
+ final VcsConfiguration configuration = VcsConfiguration.getInstance(myProject);
+ if (Boolean.TRUE.equals(configuration.SHOW_PATCH_IN_EXPLORER)) {
+ ShowFilePathAction.open(file, file);
+ } else if (Boolean.FALSE.equals(configuration.SHOW_PATCH_IN_EXPLORER)) {
+ return;
+ } else {
+ configuration.SHOW_PATCH_IN_EXPLORER =
+ ShowFilePathAction.showDialog(myProject, message, VcsBundle.message("create.patch.commit.action.title"), file);
+ }
}
}, null, myProject);
} catch (ProcessCanceledException e) {
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form
index f771e3418650..207841e3db13 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsGeneralConfigurationPanel.form
@@ -152,7 +152,7 @@
-
+
@@ -184,9 +184,9 @@
-
+
-
+
@@ -210,6 +210,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+