From 188f1411e121e8ee8975b760fa64ae9648c86f12 Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Tue, 25 Aug 2015 15:37:18 +0300 Subject: [PATCH 1/5] IDEA-144319 When starting Idea from terminal error "Cannot find VM options file" appears but Idea starts successfully --- bin/scripts/unix/idea.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh index 03d086d3b5f0..f20ed48714d5 100755 --- a/bin/scripts/unix/idea.sh +++ b/bin/scripts/unix/idea.sh @@ -136,7 +136,10 @@ if [ -n "$@@product_uc@@_PROPERTIES" ]; then IDE_PROPERTIES_PROPERTY="-Didea.properties.file=$@@product_uc@@_PROPERTIES" fi -vm_options_file="$OS_SPECIFIC_BIN_DIR/@@vm_options@@$BITS.vmoptions" +vm_options_file="$IDE_BIN_HOME/@@vm_options@@$BITS.vmoptions" +if [ ! -r "$vm_options_file" ]; then + vm_options_file="$OS_SPECIFIC_BIN_DIR/@@vm_options@@$BITS.vmoptions" +fi user_vm_options_file="$HOME/.@@system_selector@@/@@vm_options@@$BITS.vmoptions" if [ -r "$user_vm_options_file" ]; then vm_options_file="$user_vm_options_file" @@ -184,6 +187,5 @@ LD_LIBRARY_PATH="$IDE_BIN_HOME:$LD_LIBRARY_PATH" "$JDK/jre/bin/java" \ com.intellij.idea.Main \ "$@" EC=$? -exit $EC -# test $EC -ne 88 && exit $EC -# exec "$0" "$@" +test $EC -ne 88 && exit $EC +exec "$0" "$@" From ad74cfcfd9e823f5c8c28bc75a6ab965ac60523c Mon Sep 17 00:00:00 2001 From: Dmitry Batrak Date: Tue, 25 Aug 2015 15:47:22 +0300 Subject: [PATCH 2/5] EA-72099 - IOOBE: LineSet.findLineIndex --- .../src/com/intellij/openapi/editor/impl/SoftWrapModelImpl.java | 1 - 1 file changed, 1 deletion(-) 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 82f9dd86e810..142feafa4a34 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 @@ -658,7 +658,6 @@ public class SoftWrapModelImpl implements SoftWrapModelEx, PrioritizedInternalDo myApplianceManager.reset(); myStorage.removeAll(); myDeferredFoldRegions.clear(); - myEditor.getScrollingModel().scrollToCaret(ScrollType.CENTER); myApplianceManager.recalculateIfNecessary(); } From 2fdabde0ec4b82326ea803389714657086e6c3d1 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 25 Aug 2015 15:48:55 +0300 Subject: [PATCH 3/5] Collection -> List --- .../testFramework/fixtures/CodeInsightTestFixture.java | 4 ++-- .../fixtures/impl/CodeInsightTestFixtureImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java index 6e16f4efbd2c..ad282d14ab26 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/CodeInsightTestFixture.java @@ -472,9 +472,9 @@ public interface CodeInsightTestFixture extends IdeaProjectTestFixture { Document getDocument(@NotNull PsiFile file); @NotNull - Collection findAllGutters(@NotNull @TestDataFile String filePath); + List findAllGutters(@NotNull @TestDataFile String filePath); - Collection findAllGutters(); + List findAllGutters(); void type(final char c); diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java index 3702fdb42cf1..0f7f174aa90e 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java @@ -1136,14 +1136,14 @@ public class CodeInsightTestFixtureImpl extends BaseFixture implements CodeInsig @Override @NotNull - public Collection findAllGutters(@NotNull final String filePath) { + public List findAllGutters(@NotNull final String filePath) { configureByFilesInner(filePath); return findAllGutters(); } @Override @NotNull - public Collection findAllGutters() { + public List findAllGutters() { final Project project = getProject(); final SortedMap> result = new TreeMap>(); From 05a593783928847d8f7286e6f1c965af04eb0a75 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Tue, 25 Aug 2015 15:52:36 +0300 Subject: [PATCH 4/5] EA-72098 - NPE: EnumeratorStringDescriptor.getHashCode --- .../src/com/intellij/execution/TestStateStorage.java | 2 +- .../testframework/sm/runner/ui/SMTestRunnerResultsForm.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java b/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java index 9ad8808130c3..ac42d6c0f5bd 100644 --- a/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java +++ b/platform/lang-impl/src/com/intellij/execution/TestStateStorage.java @@ -94,7 +94,7 @@ public class TestStateStorage extends AbstractProjectComponent{ } } - public void writeState(String testUrl, Record record) { + public void writeState(@NotNull String testUrl, Record record) { if (myMap == null) return; try { myMap.put(testUrl, record); diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java index 32da6e01e10a..f79abadbd551 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMTestRunnerResultsForm.java @@ -828,8 +828,8 @@ public class SMTestRunnerResultsForm extends TestResultsPanel TestStateStorage storage = TestStateStorage.getInstance(getProject()); List tests = myRoot.getAllTests(); for (SMTestProxy proxy : tests) { - if (proxy.isLeaf()) { - String url = proxy.getLocationUrl(); + String url = proxy.getLocationUrl(); + if (proxy.isLeaf() && url != null) { storage.writeState(url, new TestStateStorage.Record(proxy.getMagnitude(), new Date())); } } From a1eb18141045015da597edcb9ca3b4a46dc7b577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20C=C3=A9bron?= Date: Tue, 25 Aug 2015 15:14:36 +0200 Subject: [PATCH 5/5] PlatformActions.xml: remove "configurable" attribute from s --- platform/platform-resources/src/idea/PlatformActions.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/platform/platform-resources/src/idea/PlatformActions.xml b/platform/platform-resources/src/idea/PlatformActions.xml index 975e05f4ca51..a37ba12507c0 100644 --- a/platform/platform-resources/src/idea/PlatformActions.xml +++ b/platform/platform-resources/src/idea/PlatformActions.xml @@ -363,7 +363,7 @@ - + @@ -474,7 +474,7 @@ - + @@ -499,7 +499,7 @@ - +