Vasily Pisar [Thu, 2 Jun 2016 12:23:38 +0000 (15:23 +0300)]
Merge remote-tracking branch 'origin/vasily_pisar/cmake_console' into vasily_pisar/cmake_console
Vasily Pisar [Thu, 2 Jun 2016 11:08:25 +0000 (14:08 +0300)]
Merge branch 'master' into vasily_pisar/cmake_console
peter [Thu, 2 Jun 2016 10:21:06 +0000 (12:21 +0200)]
LayeredLexerEditorHighlighter: reset tokens on setText if a language has updated the layers (WEB-21854)
peter [Thu, 2 Jun 2016 09:47:01 +0000 (11:47 +0200)]
don't build groovy stubs where they're not needed, make getParent consistent for stub and AST substrates
Vladislav.Soroka [Thu, 2 Jun 2016 09:40:33 +0000 (12:40 +0300)]
IDEA-154794 IDE does not respect <executions> section of maven-compiler-plugin
Mikhail Golubev [Wed, 1 Jun 2016 18:28:12 +0000 (21:28 +0300)]
Fix PIEAE in Python move refactoring and the quickfix "Make function from method"
Mikhail Golubev [Wed, 1 Jun 2016 17:22:46 +0000 (20:22 +0300)]
Fix the title of the tasks that search for duplicates in extract method
I've corrected capitalization of the text and move it to RefactoringBundle.
Mikhail Golubev [Wed, 1 Jun 2016 16:40:04 +0000 (19:40 +0300)]
ExtractMethodHelper#collectDuplicates runs under modal progress indicator
Mikhail Golubev [Wed, 1 Jun 2016 14:27:02 +0000 (17:27 +0300)]
Fine-grained write actions in "Extract Method" refactoring for Python
This way it's safer to launch time-consuming dependent tasks
(e.g. searching for code duplicates) synchonously since under
WriteAction they might cause deadlock.
Mikhail Golubev [Tue, 31 May 2016 18:52:24 +0000 (21:52 +0300)]
Fix PIEAE in PyExtractMethodTest
They were caused by the fact that we first replace selected fragment
with method call and then use invalided elements of the same fragment
to find its duplicates.
I split ExtractMethodHelper#processDuplicates() into two methods:
collectDuplicates() that finds duplicates before the substitution is
performed and replaceDuplicatesWithPrompt() that handles user
notification and replacing found occurrences afterwards.
The same way this refactoring is implemented for Java sources
(see ExtractMethodHandler.invokeOnElements()).
Alexander Koshevoy [Thu, 2 Jun 2016 08:39:26 +0000 (11:39 +0300)]
Merge remote-tracking branch 'origin/docker/remote-run'
Conflicts:
platform/util/resources/misc/registry.properties
peter [Thu, 2 Jun 2016 06:23:56 +0000 (08:23 +0200)]
simplify and speed up JavaAllOverridingMethodsSearcher by reusing overriding methods search checks whether a class has methods with a given name
Gregory.Shrago [Thu, 2 Jun 2016 04:54:49 +0000 (07:54 +0300)]
UISettings/EditorColors: push events through components hierarchy
Julia Beliaeva [Mon, 23 May 2016 16:21:18 +0000 (19:21 +0300)]
[vcs-log] align commit message with commit references
Julia Beliaeva [Wed, 1 Jun 2016 23:38:35 +0000 (02:38 +0300)]
[vcs-log] when log is recreated, only show balloon when log is visible
Julia Beliaeva [Wed, 1 Jun 2016 23:17:21 +0000 (02:17 +0300)]
[git] cosmetics: capitalize action title
Julia Beliaeva [Wed, 1 Jun 2016 23:06:49 +0000 (02:06 +0300)]
[file-history] copy commit subjects to the clipboard
Julia Beliaeva [Wed, 1 Jun 2016 22:29:12 +0000 (01:29 +0300)]
[file-history] optimize imports, rearrange code
Julia Beliaeva [Wed, 1 Jun 2016 22:00:35 +0000 (01:00 +0300)]
[vcs-log] properly set up aa painting for reference labels
Konstantin Bulenkov [Wed, 1 Jun 2016 20:43:56 +0000 (22:43 +0200)]
win10 make comboboxes same height as buttons
Alexander Lobas [Wed, 1 Jun 2016 20:41:46 +0000 (23:41 +0300)]
EA-83347 - IAE: NotificationParentGroup.getShortTitle
Konstantin Bulenkov [Wed, 1 Jun 2016 20:33:15 +0000 (22:33 +0200)]
win10 combobox border
Konstantin Bulenkov [Wed, 1 Jun 2016 20:32:15 +0000 (22:32 +0200)]
make hasFocus and checkFocus methods protected
Konstantin Bulenkov [Wed, 1 Jun 2016 19:50:01 +0000 (21:50 +0200)]
fix win10 buttons panel
peter [Wed, 1 Jun 2016 19:26:02 +0000 (21:26 +0200)]
implement PsiType.annotate in all subclasses using clone
Roman Shevchenko [Wed, 1 Jun 2016 19:58:53 +0000 (22:58 +0300)]
[platform] illegal character highlighting restricted to Java (IDEA-CR-10947, IDEA-156731)
Alexander Lobas [Wed, 1 Jun 2016 19:34:48 +0000 (22:34 +0300)]
IDEA-155300 Change non-sticky balloons behavior
Anton Tarasov [Wed, 1 Jun 2016 18:28:00 +0000 (21:28 +0300)]
IDEA-156956 GithubLoginPanel doesn't allow to traverse focus to dialog buttons
- Remove cyclicity from ComponentListFocusTraversalPolicy and rely on "focus cycle root" property of a container instead.
- Where a focus traversal cycle should not be closed, use "focus traversal policy provider".
- Focus cycle root is a focus policy provider by default.
Anna Kozlova [Wed, 1 Jun 2016 16:35:11 +0000 (19:35 +0300)]
EA-83404 - IAE: JUnitConfiguration.setForkMode
Anna Kozlova [Wed, 1 Jun 2016 13:21:04 +0000 (16:21 +0300)]
ignore parenthesis when building control flow (IDEA-156926)
Anna Kozlova [Wed, 1 Jun 2016 12:22:47 +0000 (15:22 +0300)]
extract superclass: hide implements base type from chooser for anonymous classes; fixed implements/extends list in the generated superclass
Anna Kozlova [Wed, 1 Jun 2016 12:00:18 +0000 (15:00 +0300)]
disable rename original during extract class if original is anonymous
(EA-82661 - IAE: PsiImplUtil.setName)
Anna Kozlova [Wed, 1 Jun 2016 11:33:06 +0000 (14:33 +0300)]
EA-83039 - NPE: RenameProcessor.doRun
Anna Kozlova [Wed, 1 Jun 2016 11:21:45 +0000 (14:21 +0300)]
EA-83061 - IOE: PsiJavaParserFacadeImpl.createExpressionFromText
Anna Kozlova [Wed, 1 Jun 2016 10:51:18 +0000 (13:51 +0300)]
read action (EA-83270 - assert: PsiFileImpl.getStubTree)
Anna Kozlova [Wed, 1 Jun 2016 10:48:21 +0000 (13:48 +0300)]
assertions for EA-83062 - IOOBE: CharSequenceSubSequence.<init>
Anna Kozlova [Wed, 1 Jun 2016 10:41:22 +0000 (13:41 +0300)]
logging for EA-83124 - assert: TextRange.<init>
peter [Wed, 1 Jun 2016 18:05:32 +0000 (20:05 +0200)]
less places that modify CompositeElement.myWrapper (IDEA-CR-11110)
Vladislav.Soroka [Wed, 1 Jun 2016 18:05:33 +0000 (21:05 +0300)]
external system: check es run configuration systemId from context
Sergey Malenkov [Wed, 1 Jun 2016 17:25:22 +0000 (20:25 +0300)]
fix rendering a table in Settings / Menus and Toolbars
Sergey Malenkov [Wed, 1 Jun 2016 16:18:46 +0000 (19:18 +0300)]
add utility method isWideSelection(JTree)
Anton Makeev [Wed, 1 Jun 2016 17:20:40 +0000 (19:20 +0200)]
teach spell checker some funtional programming
Rustam Vishnyakov [Wed, 1 Jun 2016 17:19:36 +0000 (20:19 +0300)]
Disable surround with custom region around empty space (see IDEA-134128)
Maxim.Mossienko [Wed, 1 Jun 2016 17:13:04 +0000 (19:13 +0200)]
split access lock into two: lightweight read one and lock for creating / disposing resource.
Here is some timing figures for creating / disposing resources
Opened for:com.intellij.openapi.vfs.impl.ZipHandler$1@
1832c1d, 640 for 5193
Closed for:com.intellij.openapi.vfs.impl.ZipHandler$1@
1832c1d, 352 for 2993
Opened for:com.intellij.util.io.PersistentHashMapValueStorage$1@584821, 672 for 5290
Closed for:com.intellij.util.io.PersistentHashMapValueStorage$1@584821, 464 for 6347
Opened for:com.intellij.util.io.PersistentHashMapValueStorage$2@8713f9, 576 for 3803
Closed for:com.intellij.util.io.PersistentHashMapValueStorage$2@8713f9, 544 for 7451
Maxim.Mossienko [Wed, 1 Jun 2016 16:59:20 +0000 (18:59 +0200)]
proceed with event processing once indices are initialized, 2
Bas Leijdekkers [Wed, 1 Jun 2016 15:29:40 +0000 (17:29 +0200)]
regex: don't try to search java version in project
Anton Tarasov [Wed, 1 Jun 2016 17:00:12 +0000 (20:00 +0300)]
IDEA-156235 [follow-up] apply changes from AndroidStudio (2)
The fix relates to a11y.
@author: Renaud Paquay <rpaquay@google.com>
* Set the "labelFor" property for all labels
* Re-order controls so that they are created in TAB order. This is
useful for screen readers "overview" functionality.
Julia Beliaeva [Wed, 1 Jun 2016 16:29:05 +0000 (19:29 +0300)]
[vcs-log] disable background log updates in power-save mode
Shaverdova Elena [Mon, 30 May 2016 16:07:58 +0000 (18:07 +0200)]
WI-31979 Template project: improve failure report usability
Vladislav.Soroka [Wed, 1 Jun 2016 16:22:10 +0000 (19:22 +0300)]
external system: UI nodes ordering clean-up
Vladislav.Soroka [Wed, 1 Jun 2016 16:20:21 +0000 (19:20 +0300)]
external system: there can be project tasks located under project node
Dmitry Batrak [Wed, 1 Jun 2016 16:00:22 +0000 (19:00 +0300)]
IDEA-156850 show indent guides (if configured globally) in preview editors
Konstantin Bulenkov [Wed, 1 Jun 2016 15:50:53 +0000 (17:50 +0200)]
win10 comboboxes
Konstantin Bulenkov [Wed, 1 Jun 2016 15:50:26 +0000 (17:50 +0200)]
make isTableCellRenderer() protected
Roman Shevchenko [Wed, 1 Jun 2016 15:40:21 +0000 (18:40 +0300)]
Cleanup (dependency on a fickle lib (EA-83355); dead code; sync warning)
Julia Beliaeva [Wed, 1 Jun 2016 15:34:40 +0000 (18:34 +0300)]
[git] registry option git.file.history.full that controls file history options: it adds "--full-history --simplify-merges" IDEA-153831
Julia Beliaeva [Wed, 1 Jun 2016 14:06:43 +0000 (17:06 +0300)]
[git] remove unnecessary null checks and finals
Dennis Ushakov [Wed, 1 Jun 2016 14:56:37 +0000 (17:56 +0300)]
generate html tag for html attribute
Dennis Ushakov [Wed, 1 Jun 2016 14:10:45 +0000 (17:10 +0300)]
check whether .editorconfig file belongs to the project
Dennis Ushakov [Wed, 1 Jun 2016 10:10:34 +0000 (13:10 +0300)]
replace value content only to keep jsp happy
don't close the tag for cases with unclosed attributes
Dennis Ushakov [Wed, 1 Jun 2016 09:30:45 +0000 (12:30 +0300)]
Revert "Revert "handle values containing multiple tokens""
This reverts commit
85eeec1a7ed44e3a0d7bb8ef07e8db686c369ad0.
Dmitry Batrak [Wed, 1 Jun 2016 14:54:02 +0000 (17:54 +0300)]
add comment (following IDEA-CR-11126)
peter [Wed, 1 Jun 2016 14:33:21 +0000 (16:33 +0200)]
less volatile field accesses during StubBasedPsiElementBase.getContainingFile
peter [Wed, 1 Jun 2016 14:28:48 +0000 (16:28 +0200)]
wrap menu invocations via jayatana into transaction (IDEA-156917)
peter [Wed, 1 Jun 2016 14:27:36 +0000 (16:27 +0200)]
cache part of JUnitUtil.isTestClass to avoid O(methods^2) during highlighting
Ilya.Kazakevich [Wed, 1 Jun 2016 14:19:55 +0000 (17:19 +0300)]
``verboseOnly`` added to call some code only if appropriate env var is set.
Some checks may be heavy, but required to debug hard-to-find bugs. You may run code with out them, and enable em with ``_PYCHARM_VERBOSE_MODE``
Aleksey Pivovarov [Wed, 1 Jun 2016 13:30:57 +0000 (16:30 +0300)]
diff: inline unnecessary helper classes
Aleksey Pivovarov [Wed, 1 Jun 2016 13:08:03 +0000 (16:08 +0300)]
IDEA-127833 diff: notify ReadonlyStatusHandler even if Document is writable
Aleksey Pivovarov [Wed, 1 Jun 2016 13:06:36 +0000 (16:06 +0300)]
lst: use util method
Aleksey Pivovarov [Wed, 1 Jun 2016 12:40:36 +0000 (15:40 +0300)]
diff: remove unused class
Yaroslav Lepenkin [Wed, 1 Jun 2016 13:19:10 +0000 (16:19 +0300)]
Do not detect indent for scratch files. (WEB-21649)
Sergey Ignatov [Wed, 1 Jun 2016 12:56:29 +0000 (15:56 +0300)]
remove InjectionBackgroundSuppressor
Vladimir.Orlov [Wed, 1 Jun 2016 12:36:43 +0000 (15:36 +0300)]
Merge remote-tracking branch 'origin/master'
Vladimir.Orlov [Wed, 1 Jun 2016 12:33:38 +0000 (15:33 +0300)]
IDEA-149309 Set "-XX:HeapDumpPath" and "-XX:ErrorFile" in IDE launchers.
Updated all IDEs launcher's properties.
Aleksey Pivovarov [Wed, 24 Feb 2016 09:59:09 +0000 (12:59 +0300)]
merge: allow to resolve conflict using by-word comparison in simple cases
Aleksey Pivovarov [Thu, 26 May 2016 14:08:01 +0000 (17:08 +0300)]
diff: move method to separate class
peter [Wed, 1 Jun 2016 09:43:43 +0000 (11:43 +0200)]
make getNode amortized O(1) for stub-based PSI to make it work in decent time even with 100 nested if statements
Vladimir.Orlov [Wed, 1 Jun 2016 12:21:28 +0000 (15:21 +0300)]
Merge remote-tracking branch 'origin/master'
Rustam Vishnyakov [Wed, 1 Jun 2016 12:13:11 +0000 (15:13 +0300)]
Handle indent after C-style blocks and Doc blocks
Vladimir.Orlov [Wed, 1 Jun 2016 12:13:06 +0000 (15:13 +0300)]
Merge remote-tracking branch 'origin/master'
Denis Fokin [Wed, 1 Jun 2016 12:09:42 +0000 (15:09 +0300)]
IDEABKL-6493 Wrong keys are picked up on dvorak layout in Mac OSX 10.6.2
Vladimir.Orlov [Wed, 1 Jun 2016 12:08:03 +0000 (15:08 +0300)]
IDEA-149309 Set "-XX:HeapDumpPath" and "-XX:ErrorFile" in IDE launchers.
Updated all IDEs launcher's properties.
Dmitry Avdeev [Wed, 1 Jun 2016 11:34:28 +0000 (14:34 +0300)]
do not check out current branch
Vladislav.Soroka [Wed, 1 Jun 2016 11:22:42 +0000 (14:22 +0300)]
IDEA-156819 Gradle test runner fails if assertEquals strings with unprintable chars
Alexey Kudravtsev [Wed, 1 Jun 2016 10:53:38 +0000 (13:53 +0300)]
cleanup
Alexey Kudravtsev [Wed, 1 Jun 2016 10:53:22 +0000 (13:53 +0300)]
removed expensive getResolveScope() call from isInheritor
Alexey Kudravtsev [Wed, 1 Jun 2016 10:51:27 +0000 (13:51 +0300)]
optimisation: do not scan beyond (startOffset,endOffset) if never asked to
Alexey Kudravtsev [Tue, 31 May 2016 16:36:32 +0000 (19:36 +0300)]
test fixed: everybody posts to event queue like crazy, so ignore InvocationEvents
Alexey Kudravtsev [Tue, 31 May 2016 16:09:15 +0000 (19:09 +0300)]
removed unnecessary call
Bas Leijdekkers [Wed, 1 Jun 2016 10:36:32 +0000 (12:36 +0200)]
IG: a modified variable is never redundant (IDEA-156049)
Vladimir.Orlov [Wed, 1 Jun 2016 10:35:48 +0000 (13:35 +0300)]
Merge remote-tracking branch 'origin/master'
Vladimir.Orlov [Wed, 1 Jun 2016 10:33:08 +0000 (13:33 +0300)]
Merge remote-tracking branch 'origin/master'
Dmitry Avdeev [Wed, 1 Jun 2016 10:31:41 +0000 (13:31 +0300)]
resized
Vladimir.Orlov [Wed, 1 Jun 2016 10:29:37 +0000 (13:29 +0300)]
IDEA-149309 Set "-XX:HeapDumpPath" and "-XX:ErrorFile" in IDE launchers
Dmitry Avdeev [Wed, 1 Jun 2016 10:06:51 +0000 (13:06 +0300)]
cleanup
Vladimir.Orlov [Wed, 1 Jun 2016 09:20:41 +0000 (12:20 +0300)]
Merge remote-tracking branch 'origin/master'
Vladimir.Orlov [Wed, 1 Jun 2016 09:15:26 +0000 (12:15 +0300)]
Merge remote-tracking branch 'origin/master'
Liana Bakradze [Wed, 25 May 2016 09:20:04 +0000 (12:20 +0300)]
PY-19606 main postfix template
Liana Bakradze [Tue, 24 May 2016 09:25:44 +0000 (12:25 +0300)]
PY-19607 print postfix template
Vladimir.Orlov [Wed, 1 Jun 2016 09:09:18 +0000 (12:09 +0300)]
IDEA-149309 Set "-XX:HeapDumpPath" and "-XX:ErrorFile" in IDE launchers