Ilya.Kazakevich [Tue, 22 Sep 2015 14:54:28 +0000 (17:54 +0300)]
Merge remote-tracking branch 'origin/master'
Ilya.Kazakevich [Tue, 22 Sep 2015 14:52:32 +0000 (17:52 +0300)]
PY-16973 call "#updateActionsImmediately()" to make sure action tool bar has all actions at the moment when prefered size is requested for layout purposes
Aleksey Pivovarov [Tue, 22 Sep 2015 12:49:39 +0000 (15:49 +0300)]
vcs: commit dialog - fix restored splitter position
Aleksey Pivovarov [Tue, 22 Sep 2015 11:39:26 +0000 (14:39 +0300)]
vcs: cleanup
Aleksey Pivovarov [Tue, 22 Sep 2015 10:17:20 +0000 (13:17 +0300)]
diff: testFramework: fix default selected index
Aleksey Pivovarov [Tue, 22 Sep 2015 11:03:08 +0000 (14:03 +0300)]
diff: testFramework: do not show error on success
Nadya Zabrodina [Tue, 22 Sep 2015 14:31:00 +0000 (17:31 +0300)]
[shelf]: (EA-72644) - FNFE: FileUtilRt.loadFileText; collect shelf info more safely
* IDE should not annoy user about invalid shelved patch path all the time;
* move shelve changes scheme reading to projectOpen from constructor; beacuse if something wrong all internal files will be deleted at all;
* create shelf panel during post startUp activity
Dmitry Trofimov [Tue, 22 Sep 2015 14:30:21 +0000 (16:30 +0200)]
Merge remote-tracking branch 'origin/master'
Dennis Ushakov [Tue, 22 Sep 2015 13:21:40 +0000 (16:21 +0300)]
EA-72542
Dennis Ushakov [Tue, 22 Sep 2015 12:19:11 +0000 (15:19 +0300)]
EA-73306
Dmitry Jemerov [Tue, 22 Sep 2015 13:36:17 +0000 (15:36 +0200)]
avoid holding a reference from UndoManager to the list of usages for a refactoring (KT-9214)
Valentin Fondaratov [Tue, 22 Sep 2015 13:21:08 +0000 (16:21 +0300)]
LibraryTableBase.LibraryModel: fix memory leak of not removing listeners from library table dispatcher (IDEA-142882)
Egor.Ushakov [Tue, 22 Sep 2015 13:29:24 +0000 (16:29 +0300)]
reduce delay in showing value hints
Maxim.Mossienko [Tue, 22 Sep 2015 13:21:12 +0000 (15:21 +0200)]
Following plugin versions were marked as incompatible:
Scala v1.8.0, 1.8.2, 1.8.4, 1.8.5
org.jetbrains.plugins.ruby v8.0.0.
20180821
Roman Shevchenko [Tue, 22 Sep 2015 13:23:00 +0000 (16:23 +0300)]
Merge remote-tracking branch 'origin/master'
Roman Shevchenko [Tue, 22 Sep 2015 13:22:30 +0000 (16:22 +0300)]
[tests] a test for missed file content change events
https://github.com/JetBrains/intellij-community/pull/302/
Salvatore Guarnieri [Tue, 22 Sep 2015 13:18:56 +0000 (16:18 +0300)]
Fix file length check
IJ uses the timestamp and file length to determine if two files
differ. In almost all cases, the timestamp will be sufficient
but there are some important use cases were timestamps are
manipulated inside of archives to ensure the archives only
differ when their actual contents differ.
The operation of reading the currently stored file size could
cause a read of file size from disk. That makes the up-to-date
check broken since it will be comparing the new file size to the
file size just read from disk, which should be the same as the
new file size.
https://github.com/JetBrains/intellij-community/pull/302/
Sergey Malenkov [Tue, 22 Sep 2015 13:07:43 +0000 (16:07 +0300)]
inherit some text attributes in the darcula color scheme
Anna Kozlova [Tue, 22 Sep 2015 12:57:19 +0000 (15:57 +0300)]
class escapes declared scope: ignore local and anonymous classes; replace duplicated code (IDEA-143851)
Sergey Ignatov [Tue, 22 Sep 2015 12:53:58 +0000 (15:53 +0300)]
get rid of unused methods
liana.bakradze [Tue, 22 Sep 2015 12:06:04 +0000 (15:06 +0300)]
added missing icon for action
Sergey Malenkov [Tue, 22 Sep 2015 11:55:32 +0000 (14:55 +0300)]
add filter for icons
Sergey Malenkov [Tue, 22 Sep 2015 11:22:17 +0000 (14:22 +0300)]
add base test for color-blindness simulation/daltonization
Sergey Malenkov [Mon, 21 Sep 2015 17:30:44 +0000 (20:30 +0300)]
add utility method to filter images
Sergey Malenkov [Mon, 21 Sep 2015 16:58:09 +0000 (19:58 +0300)]
add filters for daltonization and simulation ColorBlindness
Eugene Zhuravlev [Tue, 22 Sep 2015 11:57:34 +0000 (13:57 +0200)]
better recursive NIO deletion fix
Sergey Ignatov [Tue, 22 Sep 2015 11:41:02 +0000 (14:41 +0300)]
DBE-1039 SQL: execute selected statements from the file structure
Sergey Ignatov [Tue, 22 Sep 2015 11:36:51 +0000 (14:36 +0300)]
cleanup
Anna Kozlova [Tue, 22 Sep 2015 11:38:18 +0000 (14:38 +0300)]
declare collections as interface: cleanup duplicated code; fix 'weaken to null' suggestion for variables; weakest type finder: ignore calls with type cast as parent (IDEA-145398)
Alexey Kudravtsev [Tue, 22 Sep 2015 11:23:18 +0000 (14:23 +0300)]
Reverted
Alexey Kudravtsev [Mon, 21 Sep 2015 14:36:18 +0000 (17:36 +0300)]
notnull
Denis Fokin [Tue, 22 Sep 2015 11:15:08 +0000 (14:15 +0300)]
NPE in the boot jdk action
Sergey Ignatov [Tue, 22 Sep 2015 11:07:03 +0000 (14:07 +0300)]
extra space
Dmitry Trofimov [Tue, 22 Sep 2015 10:57:09 +0000 (12:57 +0200)]
Don't throw exception in case of removal of sdk during update process.
Dmitry Trofimov [Tue, 22 Sep 2015 10:54:09 +0000 (12:54 +0200)]
Fix removing sdk from jdkTable.
If sdk was added and the change has been applied, this sdk wasn't removed from jdkTable by remove action.
Aleksey Pivovarov [Tue, 22 Sep 2015 09:28:30 +0000 (12:28 +0300)]
javadoc
Egor.Ushakov [Tue, 22 Sep 2015 09:46:02 +0000 (12:46 +0300)]
fixed incorrect evaluate expression for list children
Aleksey Pivovarov [Mon, 21 Sep 2015 09:55:50 +0000 (12:55 +0300)]
project: add VCS bindings
Mikhail Golubev [Mon, 21 Sep 2015 13:08:43 +0000 (16:08 +0300)]
Fix IOOBE in PlainDocString parser (EA-73320)
Mikhail Golubev [Mon, 21 Sep 2015 12:44:04 +0000 (15:44 +0300)]
PY-16870, PY-16972 Complete actual name of PyClass inside docstrings, not its toString()
See com.intellij.codeInsight.completion.CompletionData#objectToLookupItem
Vladimir.Orlov [Tue, 22 Sep 2015 06:47:25 +0000 (09:47 +0300)]
IDEA-CR-4703 Removed info message.
Konstantin Bulenkov [Mon, 21 Sep 2015 22:09:46 +0000 (00:09 +0200)]
Merge remote-tracking branch 'origin/master'
Konstantin Bulenkov [Mon, 21 Sep 2015 22:05:02 +0000 (00:05 +0200)]
use xF8 background for disabled comboboxes for mac laf
Konstantin Bulenkov [Mon, 21 Sep 2015 22:04:14 +0000 (00:04 +0200)]
fix disabled middle part of combobox for Mac laf
Ilya.Kazakevich [Mon, 21 Sep 2015 20:47:28 +0000 (23:47 +0300)]
Merge remote-tracking branch 'origin/master'
Ilya.Kazakevich [Mon, 21 Sep 2015 20:44:17 +0000 (23:44 +0300)]
PY-16926 skeleton sync
Vladimir Krivosheev [Mon, 21 Sep 2015 20:02:22 +0000 (22:02 +0200)]
fix tests IDEA-CR-5124
Such dangerous change must be tested, documented and not enabled by default. It is client responsibility to clear VFS stale data. Or VfS itself must clear on each test run.
Vladimir Krivosheev [Mon, 21 Sep 2015 19:44:35 +0000 (21:44 +0200)]
fix kotlin compilation
Vladimir Krivosheev [Mon, 21 Sep 2015 18:57:21 +0000 (20:57 +0200)]
fix regression after "must be leftovers from the previous test run"
Anna Kozlova [Mon, 21 Sep 2015 18:38:59 +0000 (21:38 +0300)]
store context psi location
Vladimir Krivosheev [Mon, 21 Sep 2015 18:31:08 +0000 (20:31 +0200)]
"
54ffb71 make temporary names more nice-looking, remove project files cached in VFS from the previous tests" is partially incorrect — test name must be sanitized
Vladimir Krivosheev [Mon, 21 Sep 2015 18:24:20 +0000 (20:24 +0200)]
cleanup — use ThrowableRunnable
Vladimir Krivosheev [Mon, 21 Sep 2015 18:20:30 +0000 (20:20 +0200)]
cleanup
Vladimir Krivosheev [Mon, 21 Sep 2015 18:03:18 +0000 (20:03 +0200)]
WEB-17691 built-in server doesn't serve files it doesn't have in the project tree
Vladimir Krivosheev [Mon, 21 Sep 2015 15:50:28 +0000 (17:50 +0200)]
convert to Kotlin
Vladimir Krivosheev [Mon, 21 Sep 2015 15:25:16 +0000 (17:25 +0200)]
cleanup
Anna Kozlova [Mon, 21 Sep 2015 17:16:12 +0000 (20:16 +0300)]
test discovery: don't disable foreign listeners (IDEA-145371)
Anna Kozlova [Mon, 21 Sep 2015 16:58:10 +0000 (19:58 +0300)]
cancel automatic renamer should not cancel rename itself (IDEA-145351)
Anna Kozlova [Mon, 21 Sep 2015 16:57:48 +0000 (19:57 +0300)]
tests ui: optimization for generated tests with same names under one test root (IDEA-145298)
Anna Kozlova [Mon, 21 Sep 2015 14:53:52 +0000 (17:53 +0300)]
invalidate duration: increase common duration on test basics
Anna Kozlova [Mon, 21 Sep 2015 10:59:26 +0000 (13:59 +0300)]
separate icon for implementing functional (IDEA-144025)
Anna Kozlova [Mon, 21 Sep 2015 10:09:11 +0000 (13:09 +0300)]
EA-42483 - NPE: ControlFlowUtil$MyVisitor.visitInstruction
Roman Shevchenko [Mon, 21 Sep 2015 17:29:45 +0000 (20:29 +0300)]
Merge remote-tracking branch 'origin/master'
Gregory.Shrago [Mon, 21 Sep 2015 16:56:47 +0000 (19:56 +0300)]
make null-friendly
Dmitry Trofimov [Mon, 14 Sep 2015 22:05:20 +0000 (00:05 +0200)]
Pty4j updated for JNA 4.1
Konstantin Kolosovsky [Tue, 10 Feb 2015 16:17:00 +0000 (19:17 +0300)]
svn: Explicitly set "ignore externals = true" while browsing repository using SVNKit integration (otherwise error could occur with new SVNKit 1.8.7 version - for instance, error occurs when protocols for original and external repositories are different and event handler is not set for SVNLogClient)
Konstantin Kolosovsky [Sat, 7 Feb 2015 12:52:54 +0000 (15:52 +0300)]
svn: Explicitly specify format (1.6 or 1.7) of working copy to create during checkout when using SVNKit integration (otherwise 1.8 working copy will be created by new SVNKit 1.8.7 version while 1.7 is necessary)
Konstantin Kolosovsky [Sat, 7 Feb 2015 01:02:48 +0000 (04:02 +0300)]
svn: Upgraded SVNKit library to 1.8.7
Konstantin Kolosovsky [Sat, 7 Feb 2015 01:48:19 +0000 (04:48 +0300)]
Upgraded jsch-agent-proxy library to 0.0.7
Roman Shevchenko [Tue, 10 Feb 2015 21:46:45 +0000 (00:46 +0300)]
platform: JNA updated to 4.1.0 (jna-utils -> jna-platform)
Roman Shevchenko [Tue, 10 Feb 2015 21:29:44 +0000 (00:29 +0300)]
platform: JNA updated to 4.1.0 (code)
Roman Shevchenko [Tue, 10 Feb 2015 21:29:33 +0000 (00:29 +0300)]
platform: JNA updated to 4.1.0 (libs)
Ilya.Kazakevich [Mon, 21 Sep 2015 16:16:06 +0000 (19:16 +0300)]
Merge remote-tracking branch 'origin/master'
Ilya.Kazakevich [Mon, 21 Sep 2015 16:14:20 +0000 (19:14 +0300)]
PY-16926 __init__ copied to skeleton to prevent skeleton from overriding actual method
Egor.Ushakov [Mon, 21 Sep 2015 16:06:12 +0000 (19:06 +0300)]
fixed wording in settings for early return
Egor.Ushakov [Mon, 21 Sep 2015 15:55:56 +0000 (18:55 +0300)]
fixed compatibility with kotlin
Konstantin Bulenkov [Mon, 21 Sep 2015 15:54:55 +0000 (17:54 +0200)]
Merge remote-tracking branch 'origin/master'
Konstantin Bulenkov [Mon, 21 Sep 2015 15:51:48 +0000 (17:51 +0200)]
Three state checkbox: don't paint indeterminate sign on Mac with IntelliJ LaF
Konstantin Bulenkov [Mon, 21 Sep 2015 15:50:47 +0000 (17:50 +0200)]
Intellij laf support indeterminate state for Mac OS X
Konstantin Bulenkov [Mon, 21 Sep 2015 15:49:18 +0000 (17:49 +0200)]
CheckBox on Mac: indeterminate state for blue theme
Konstantin Bulenkov [Mon, 21 Sep 2015 15:48:22 +0000 (17:48 +0200)]
CheckBox on Mac: indeterminate state for graphite
Aleksey Pivovarov [Fri, 7 Aug 2015 12:22:18 +0000 (15:22 +0300)]
merge: allow to specify custom captions
Roman Shevchenko [Mon, 21 Sep 2015 15:43:05 +0000 (18:43 +0300)]
[platform] fixes UOE on shell environment loading (IDEA-CR-5094)
Egor.Ushakov [Mon, 21 Sep 2015 15:39:03 +0000 (18:39 +0300)]
early return: evaluate finally block if needed
Vladimir Krivosheev [Mon, 21 Sep 2015 15:11:39 +0000 (17:11 +0200)]
cleanup
Vladimir Krivosheev [Mon, 21 Sep 2015 15:00:15 +0000 (17:00 +0200)]
fix compilation
Vladimir Krivosheev [Mon, 21 Sep 2015 14:36:39 +0000 (16:36 +0200)]
cleanup
Vladimir Krivosheev [Mon, 21 Sep 2015 14:16:05 +0000 (16:16 +0200)]
fix after merge
Vladimir Krivosheev [Mon, 21 Sep 2015 13:48:53 +0000 (15:48 +0200)]
robust tearDown — one failed test must not cause the whole run fail
Vladimir Krivosheev [Mon, 21 Sep 2015 11:13:49 +0000 (13:13 +0200)]
avoid NPE in tests
Vladimir Krivosheev [Mon, 21 Sep 2015 11:11:12 +0000 (13:11 +0200)]
WEB-17803 Built-in webserver truncates output on large php files
Vladimir Krivosheev [Mon, 21 Sep 2015 10:57:29 +0000 (12:57 +0200)]
cleanup
Vladimir Krivosheev [Mon, 21 Sep 2015 10:04:19 +0000 (12:04 +0200)]
ensure that module model and library model are disposed on error
Vladimir Krivosheev [Mon, 21 Sep 2015 09:52:58 +0000 (11:52 +0200)]
cleanup
Vladimir Krivosheev [Mon, 21 Sep 2015 09:33:05 +0000 (11:33 +0200)]
cleanup
Vladimir Krivosheev [Mon, 21 Sep 2015 08:43:01 +0000 (10:43 +0200)]
cleanup
Vladimir Krivosheev [Mon, 21 Sep 2015 08:36:55 +0000 (10:36 +0200)]
cleanup (javaClass<> is deprecated, JvmStatic)
kotlin m13 — not-null upper bound now could be specified even if override method defined in java
Vladimir Krivosheev [Mon, 21 Sep 2015 08:10:13 +0000 (10:10 +0200)]
cleanup
Vladimir Krivosheev [Mon, 21 Sep 2015 07:49:55 +0000 (09:49 +0200)]
fix after merge
Vladimir Krivosheev [Fri, 18 Sep 2015 11:49:52 +0000 (13:49 +0200)]
cleanup