Snapshot b9931c55d2175b6552f90b2225eb09c13bd6dfed from idea/133.609 of git://git.jetbrains.org/idea/community.git

b9931c5: [git log] IDEA-119247 Use "--date-order" when requesting filtered results
a425d83: [vcs-log] user-filter: treat empty user name as no filter.
54b87b7: [log] IDEA-116242 Allow multiple users selection in the log filter
75057c2: [^Evdokimov] IDEA-118027 Groovy: constructors with mixed privacy are flagged as errors
f6f884e: [^Vishnyakov] IDEA-119085 Code style does not recognize Groovy spaceship operator <=>
d1d61a1: [^Peter]IDEA-117982 correct classpath for groovy scripts
448557f: [^Peter]IDEA-118920 introduce local var intention should not start in write action
3e0ac06: IDEA-118521 Latest 13.0.1 keeps locking up. Editor becomes unresponsive. Various file types... using allScope() (cherry picked from commit a7d5dd0)
d3978ef: IDEA-118521 Latest 13.0.1 keeps locking up. Editor becomes unresponsive.  Various file types. Using XmlPropertiesIndex to avoid getting xml file content (cherry picked from commit 602db68)
d0a2612: IDEA-119344 (Incorrect "Unnecessary call toString()" inspection when super is used) (cherry picked from commit ed03022)[CR-IC-4005]
d719338: IDEA-118429 (IDEA incorrectly suggests to remove unboxing) (cherry picked from commit c450665)[CR-IC-3938]
0ae5316: IDEA-118743 (False positive "Number of placeholders does not match number of arguments in logging call") (cherry picked from commit 8f76e73)[CR-IC-3854]
c641c52: IDEA-118181 (false positive "number of placeholders does not match number of arguments" for multi-catch) (cherry picked from commit bbc19f5)[CR-IC-3855]
4a5654f: IDEA-118588 (Concatenation with empty string fails to fix an expression) (cherry picked from commit 01753c7)[CR-IC-3801]
3bdf7c6: fix quickfix breaking code when non-static inner class was used from an other file (cherry picked from commit 5e9c2c3)[CR-IC-3659]
2ddc8f5: IDEA-118004 (Find's Regex Help Popup table header bad color with darcula) (cherry picked from commit 95399a1)[CR-IC-3634]
39b0f0c: IDEA-117863 (Package with disjoint dependency graph ignores interfaces) (cherry picked from commit 1257700)[CR-IC-3623]
8805c17: fix and clarify "Cyclic class dependency" inspection warning (cherry picked from commit 68b7ce4)[CR-IC-3800]
4a1b901: EA-52499 - NPE: BraceHighlightingHandler.highlightBraces
365533d: EA-53134 - IOE: DocumentImpl.doBeforeChangedUpdate
186cc36: unused code
81af309: extract DummyCachingFileSystem: put all the weirdness in one place
754c063: Merge branch '133' of git.labs.intellij.net:idea/community into 133
eee267b: Update Python plugin
a3fbc3a: IDEA-118989 Code Formatting broken in 13.0.2 EAP [CR-IC-3927] (cherry picked from commit 4d2a597)
96c57db: IDEA-118616 Lens mode with tool windows on the right side (cherry picked from commit 56738b2) [reviewed by kb]
2b06e76: IDEA-117831 After deleting last live template in a group, I can't click OK. (cherry picked from commit 41f6f85)
187d6b1: get rid of psi/doc inconsistency before reparse by not relying on TextBlock information (cherry picked from commit c7a0408)
42f85ee: IDEA-113344 An easy way to exit from full screen mode using mouse (cherry picked from commit 458c964) [reviewed by kb]
ace88bd: Merge branch '133' of git.labs.intellij.net:idea/community into 133
c9bad57: Update Python plugin
43cf538: IDEA-94950 Code Style | Arrangement: AIOOBE at ArrangementMatchingRulesModel.removeRow() on removing the last rule that is in edit mode (cherry picked from commit 9a60903)
b06982f: introduce AbstractNavBarExtension with processChildren(..) API
15a665c: unwrap: allow to unwrap catch for try-with-resources statement
5b9a6c0: strip @SuppressWarning on delegating (IDEA-118528)
2d0486c: IDEA-111535 Edit Language Fragment: Synchronization is broken after tab drag
ebfaf78: true -> false!
84434d5: avoid NPE for non-text editors
204395c: Merge remote-tracking branch 'origin/133' into 133
8a44e62: delete catch fix: introduce ARM
79b66a1: can be final: ensure non final for base of anonymous class (IDEA-118493)
dc2a67b: IDEA-118496 disable boolean param inspection for library overriders
1469417: run manager: do not override shared status from default configuration when existing configuration is checked e.g. run from tests view
c03e718: junit: reject to start when no tests were found in package
81b8ea2: refactoring listeners: missed after data (IDEA-119118)
b9535cd: refactoringIDs: IDEA-119121;IDEA-119122
429cc6e: IDEA-118487 IDEA should suggest downloading missing plug-ins for unrecognised artifact configuration
1e49463: plugin advertiser: do not suggest to update from ultimate to ultimate when 'bundled' plugin is not yet available for current version
12185dd: ensure public inner inside interface (IDEA-118564) (cherry picked from commit 3d7a8fb)
fbe5a3a: Fix maven tests. (cherry picked from commit 1e4e54d)
fd30aa3: detect the plugin responsible for run configuration AbstractMethodError (IDEA-119173) (cherry picked from commit 70b8663)
fe4dd2e: make show usages consistent with Find usages
28194cd: IDEA-97930
41ad9e0: Merge branch '133' of git.labs.intellij.net:idea/community into 133
d89f761: rename while we still can
c484ee3: backported IDEA-118742 and IDEA-112104
e5ccd29: Fix blink maven test.
a1e1aab: Add retina version for executeMavenGoal.png icon. (cherry picked from commit 1466df4)
785932d: IDEA-112104 "Find Usages Settings Dialog" button re-emerged in "Find in Path" results
c5cdb6d: do not allow slash in the middle of the child name
88c56dd: correctly handle request for the not-canonically named child
b52c02a: mac file chooser must respect FileChooserDescriptor.isFileSelectable +review
b48ed4b: WEB-10360 Javascript debugger with non unique file names
32e35af: prevent cancellation upon removing data from indices, to avoid state data in e.g. stub index IDEA-117290 (cherry picked from commit 4ec42a6) [r=Peter.Gromov]
dfb6509: IDEA-118675 - Errors in app server run configs not shown in UI (cherry picked from commit 3feff30)
72e247a: cleanup (commented code) (cherry picked from commit 0063990)
e175aab: Merge remote-tracking branch 'origin/133' into 133
4c89b6f: allow external documentation over references with multiple resolve (cherry picked from commit 7b239df) [r=Roman.Shevchenko]
fd46f79: remove unwanted registry.properties changes
54d3383: - fixed serialization for DOM indexes - DOM indices work without exception about stub mismatch (cherry picked from commit cff5c6c)
47af646: DOM index: @StubbedOccurrence (cherry picked from commit 3a22d6f)
d7ada2a: IDEA-115702 DomAnchorImpl exception: element stubs indexed (cherry picked from commit d0b977b)
ae79e45: [^romka] make IDEA-94683 fix controllable via registry (Completion popup loses focus when viewing documentation (sometimes, almost always))
0681b33: fixwd a few IndexNotReadyExceptions
b98216f: extract checkDisposed() with verbose reporting
751194e: Database navbar extension
0a4129c: EditorSplitters: update shortcuts on keymap change
c23ada7: IDEA-118970 (external URL formatting for Javadoc 8)
72f30cb: IDEA-118970 (preparation, cleanup, minor optimization)
41dfb6c: [log] simplify loading details around selected commit
ed79a3b: IDEA-118763 (handle project component initialization errors)
0e2378a: preselect exact prefix match in autopopup completion (RUBY-14617) (cherry picked from commit 6a771e7)
d50fe83: IDEA-119047 (MidnightBSD test)
2f72a0b: Fixed tips of the day.
07ec483: New PyCharm tips of the day.
1d0f380: Cut out escapes from vagrant output in message dialogs.
58e844c: Make setters return this to encourage functional style.
73d7b88: [git] IDEA-116738 Don't eat newlines when amending
ee2f349: [git] IDEA-115594 Don't join equal commit messages from different roots
a9a0505: IDEA-118330 (kill unresponsive environment reader after timeout)
b59cdcf: fix performance problem on 'new Object() {}' test code (cherry picked from commit 3d634e4)[CR-IC-3799]
cca9a90: LOG.debug which file is currently checked when running inspections globally (IDEA-118567) (cherry picked from commit c78d7e4)
7e7469c: Make the constant final
b2158f1: [git] Understand renames in the log
ff04982: [log] IDEA-117680 IDEA-116207 Fix showing Changes for multi-selection
482ab9e: [log] Flush the Hash->Int persistent map more often
8ab87771: [git log] Don't display "index" and "stash" pseudo-commits in the log
5918341: [vcs] IDEA-118644 Fix apply patch for new file in new folder + test
8fc76f5: [log] IDEA-115423 Limit number of commits requested when filtering
0183fd2: [log] simplify
96ad748: [log] Take END_COMMIT_NODE as well as COMMIT_NODE
6ca69c0: [log] Fix identifying root of Node
532cf87: [log] Supply correct commit object to getCommitData in DetailsPanel
9f4eb47: [log] Correctly load details of commits around the selected commit
edf55a4: take words from other files if there is no variants from current file at all (IDEA-117511) (cherry picked from commit 64575f6) [r=Peter.Gromov]
6a00485: IOBE fix IDEA-118696 (cherry picked from commit b1a787f)
5b2b564: performance fix IDEA-116803 (cherry picked from commit 5bd84de)
4f7e1f2: nonempty check (cherry picked from commit eead8f1) [r=Peter.Gromov]
13d7e20: project disposed check (cherry picked from commit ab602cb) [r=Peter.Gromov]
7437593: IDEA-118718 Occasionally seeing "Low disk space on a IntelliJ IDEA system directory partition" (cherry picked from commit 22c7a4f) [r=Peter.Gromov/Roman.Shevchenko]
2d1303f: IDEA-111684 Quick Documentation should resolve values for aggregated / indirect constants (cherry picked from commit 065fa6d) [r=Anna.Kozlova]
281a9fc: slightly better fix for IDEA-118691 (cherry picked from commit e87a766) [r=Anna.Kozlova]
d55d31a: IDEA-118745 Show directory in editor tabs for non-unique filenames doesn't work for non-project files (cherry picked from commit e560ee2) [r=Peter.Gromov]
c9d6d82: IDEA-118446 Installation and plugin update (patch) download ignores Settings / HTTP Proxy (cherry picked from commit 90f2e9c) [r=Anna.Kozlova]
0083f07: IDEA-118787 IAE: Argument 0 for @NotNull parameter of com/intellij/codeInspection/dataFlow/value/DfaPsiType.<init> must not be null (with testcase) (cherry picked from commit 2f26745)
1e2b2ce: Merge branch '133' of git.labs.intellij.net:idea/community into 133
2267ace: updated code compatibility inspection
fd4da08: IDEA-116910 (Invalid "unnecessary explicit numeric cast" warning) (cherry picked from commit 7c80f38)[CR-IC-3747]
cd2e961: IDEA-116758 ('equals()' between objects of inconvertible types - not working for ...= equals("differentClass")); (cherry picked from commit faa180a)[CR-IC-3355]
e235284: new in 13, because these inspections were not actually integrated into 12.1 (cherry picked from commit 3b6f9bf)
dd4e427: IDEA-92545 (Type maybe weakened does not always work) (cherry picked from commit 4d5bfb7)[CR-IC-3791]
565054e: IDEA-55970 (Erroneous "type may be weakened to 'null'" in generic method) (cherry picked from commit db52690)[CR-IC-3749]
e2f6fea: IDEA-116682 ("Collection declared by class, not interface" suggests abstract classes) (cherry picked from commit 240a1ff)[CR-IC-3748]
a2e586e: fixed PY-11673 Error on project creation
6dac33f: Prefer highlighting passes for the selected editor (IDEA-23831)
f3ea46e: updated test data for python3.4
3eb3a59: Added error message for missing python-skeletons diagnostics (PY-10411)
c134015: Made builtins cache valid only if it has a valid reference to the builtins file (PY-11665)
d8d5d79: Switched back to char-based triple quotes detection for docstring element types (PY-11585)
60a4ea9: fixed PY-11654 Move Statement: IOE at com.intellij.openapi.editor.impl.DocumentImpl.d
1b780fe: fixed PY-11610 Django johnny-cache breaks django_test_manage.py
fa9d315: fixed PY-11581 RST: Header is not highlighted if there is a space after separator
32c1775: fixed PY-11588 "Instance attribute %s defined outside __init__" in static method
cfd8060: fixed PY-11617 Nosetest runner: simple function tests cannot jump to source
540f5a9: Switched to synchronized count of running Python skeleton generators
8f167a4: Don't add python-skeletons to Python paths during skeletons generation
41c891b: Don't show python-skeletons path in the Python interpreter paths tab (PY-11218)
42ee478: Don't report unresolved references and unused imports during skeletons generation
017accd: Return unknown return type for generator functions if the built-in generator type is not found
115af20: Don't report unresolved references and unused imports if the project interpreter is not selected (PY-11589)
daf47ee: Call a static method via its defining class, not its subclass
baf4d9e: Removed unused PythonSdkType.switchPathToInterpreter()
4257828: Nullity annotations for overridden methods
ec6753c: Moved skeleton generation progress on adding a Python interpreter to background
9901a18: Switched from showing balloons to logging errors for serious skeleton generation exceptions
6d2c9c0: Added ellipses for skeleton processing progress messages
7ba1d4f: Merge branch '133' of git.labs.intellij.net:idea/community into 133
f0918d5: Fixed PIEAE in referencing obsolete cached PSI elements for built-in 'str | unicode' type
9bd03d9: Rearranged fields and constructors
85295da: Removed unused PyBuiltinCache.isValid()
8603b21: Removed stdlib type cache unused after the switch to python-skeletons
2e2a3ee: Call static methods via classes where they are actually defined
d0deed6: fixed PY-11594 New Project: selected interpreter is not set as project interpreter when attaching project to already opened one
dd98a8e: fixed PY-11595 Unable to move lines within Python doc strings

Change-Id: I389125baa54f7a0f40ce6a7e7c059241e3a4ff0c

1 files changed, 1 insertions, 1 deletions

diff --git a/bin/scripts/unix/idea.sh b/bin/scripts/unix/idea.sh
index dfa1a419a594..fa9febc4c103 100755
--- a/bin/scripts/unix/idea.sh
+++ b/bin/scripts/unix/idea.sh
@@ -53,7 +53,7 @@ elif [ -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
 else
   JAVA_BIN_PATH=`which java`
   if [ -n "$JAVA_BIN_PATH" ]; then
-    if [ "$OS_TYPE" = "FreeBSD" ]; then
+    if [ "$OS_TYPE" = "FreeBSD" -o "$OS_TYPE" = "MidnightBSD" ]; then
       JAVA_LOCATION=`JAVAVM_DRYRUN=yes java | "$GREP" '^JAVA_HOME' | "$CUT" -c11-`
       if [ -x "$JAVA_LOCATION/bin/java" ]; then
         JDK="$JAVA_LOCATION"