idea/community.git
7 years agoMerge remote-tracking branch 'origin/master'
Ilya.Kazakevich [Wed, 15 Oct 2014 20:47:59 +0000 (00:47 +0400)]
Merge remote-tracking branch 'origin/master'

7 years agoPY-13599 Moving a function fails with "Cannot bind to element"
Ilya.Kazakevich [Wed, 15 Oct 2014 20:47:24 +0000 (00:47 +0400)]
PY-13599 Moving a function fails with "Cannot bind to element"

7 years agodfa: prevent exponential memory usage in live var analyzer (IDEA-131285)
peter [Wed, 15 Oct 2014 19:10:41 +0000 (21:10 +0200)]
dfa: prevent exponential memory usage in live var analyzer (IDEA-131285)

* skip "not interesting" instructions
* cancel dfa after processing too many different states

7 years agoIDEA-118383 Git: Contained in branches pane is not scrollable
Vassiliy.Kudryashov [Wed, 15 Oct 2014 17:36:48 +0000 (21:36 +0400)]
IDEA-118383 Git: Contained in branches pane is not scrollable

7 years agodecompiler: map all lines according to bytecode information
Egor.Ushakov [Wed, 15 Oct 2014 16:20:44 +0000 (20:20 +0400)]
decompiler: map all lines according to bytecode information

7 years agoFix vertical gaps for big fonts in push dialog tree renderer.
Nadya Zabrodina [Wed, 15 Oct 2014 16:13:37 +0000 (20:13 +0400)]
Fix vertical gaps for big fonts  in push dialog tree renderer.

7 years agoIDEA-131301 Push dialog has wrong indents in the commit tree view
Nadya Zabrodina [Wed, 15 Oct 2014 13:17:15 +0000 (17:17 +0400)]
IDEA-131301 Push dialog has wrong indents in the commit tree view

*expand/collapse tree icons removed for single-repo project

7 years agoMerge remote-tracking branch 'origin/master'
Ilya.Kazakevich [Wed, 15 Oct 2014 16:05:09 +0000 (20:05 +0400)]
Merge remote-tracking branch 'origin/master'

7 years agoPY-13061 Getter signature should be self: false positive for properties with other...
Ilya.Kazakevich [Wed, 15 Oct 2014 16:04:39 +0000 (20:04 +0400)]
PY-13061 Getter signature should be self: false positive for properties with other decorators

7 years agoMerge remote-tracking branch 'origin/master'
Andrey Vlasovskikh [Wed, 15 Oct 2014 15:42:32 +0000 (19:42 +0400)]
Merge remote-tracking branch 'origin/master'

7 years agoIDEA-118383 Git: Contained in branches pane is not scrollable
Vassiliy.Kudryashov [Wed, 15 Oct 2014 15:37:41 +0000 (19:37 +0400)]
IDEA-118383 Git: Contained in branches pane is not scrollable
IntelliJ LAF fix (get rid of description gray background)

7 years agoMerge branch 'union-type-inference'
Andrey Vlasovskikh [Wed, 15 Oct 2014 15:36:46 +0000 (19:36 +0400)]
Merge branch 'union-type-inference'

7 years agojava-decompiler: show legal notice only for decompiled files
Roman Shevchenko [Wed, 15 Oct 2014 15:26:35 +0000 (17:26 +0200)]
java-decompiler: show legal notice only for decompiled files

7 years agoUse editor caret position for action "View PSI Structure in Current File"
Alexander Lobas [Wed, 15 Oct 2014 15:18:50 +0000 (19:18 +0400)]
Use editor caret position for action "View PSI  Structure in Current File"

7 years agoFix bad behaviour of the LayeredLexer if a layer or delegate has the state of 2048
Valentin Fondaratov [Wed, 15 Oct 2014 15:07:25 +0000 (19:07 +0400)]
Fix bad behaviour of the LayeredLexer if a layer or delegate has the state of 2048

7 years agoIDEA-131113 Use project names in Redmine repository UI
Mikhail Golubev [Wed, 15 Oct 2014 10:52:44 +0000 (14:52 +0400)]
IDEA-131113 Use project names in Redmine repository UI

Seems that in some old versions of Redmine it was possible to create
project without unique identifier assigned and thus such projects were shown
as "null"s in projects tree.

7 years agoIDEA-131298 Eliminate Ctrl+enter vs Enter confusion in evaluation dialog - switched...
Egor.Ushakov [Wed, 15 Oct 2014 14:56:50 +0000 (18:56 +0400)]
IDEA-131298 Eliminate Ctrl+enter vs Enter confusion in evaluation dialog - switched to ctrl+shift+enter

7 years agoIDEA-94552: diff connector line is too short by one pixel
Aleksey Pivovarov [Wed, 15 Oct 2014 14:55:19 +0000 (18:55 +0400)]
IDEA-94552: diff connector line is too short by one pixel

do not show border for binary file viewer

7 years agoIDEA-131239 "Alt F3" search in editor should have "pink" background if there are...
Vassiliy.Kudryashov [Wed, 15 Oct 2014 14:37:53 +0000 (18:37 +0400)]
IDEA-131239 "Alt F3" search in editor should have "pink" background if there are no matches

7 years agoFixed type inference for subscription operator of a union type (PY-12862)
Andrey Vlasovskikh [Wed, 15 Oct 2014 13:58:13 +0000 (17:58 +0400)]
Fixed type inference for subscription operator of a union type (PY-12862)

7 years agoIDEA-94552: diff connector line is too short by one pixel
Aleksey Pivovarov [Wed, 15 Oct 2014 14:24:49 +0000 (18:24 +0400)]
IDEA-94552: diff connector line is too short by one pixel

7 years ago[log] Fix misprint in diagnostics for "No references pointing to head" error webstorm/140.132
Kirill Likhodedov [Wed, 15 Oct 2014 14:12:37 +0000 (18:12 +0400)]
[log] Fix misprint in diagnostics for "No references pointing to head" error

7 years agofix emmet popup closing on combobox triangle click
Dennis Ushakov [Wed, 15 Oct 2014 14:07:57 +0000 (18:07 +0400)]
fix emmet popup closing on combobox triangle click

7 years agodo trace if explicitly enabled
Maxim.Mossienko [Wed, 15 Oct 2014 14:05:28 +0000 (16:05 +0200)]
do trace if explicitly enabled

7 years agoFileIncludeIndex version must respect FileIncludeProviders
Alexander Doroshko [Wed, 15 Oct 2014 14:02:40 +0000 (18:02 +0400)]
FileIncludeIndex version must respect FileIncludeProviders

7 years agoIntroduced method FileIncludeProvider.resolveIncludedFile, so that included file...
Alexander Doroshko [Wed, 15 Oct 2014 13:37:39 +0000 (17:37 +0400)]
Introduced method FileIncludeProvider.resolveIncludedFile, so that included file could be resolved without using standard FileReferenceSet

7 years agoEDU-186, EDU-184 progress bar bugs
Liana Bakradze [Wed, 15 Oct 2014 13:59:50 +0000 (17:59 +0400)]
EDU-186, EDU-184 progress bar bugs

7 years agoRunManager — don't clear shared RC on loadState
Vladimir Krivosheev [Wed, 15 Oct 2014 13:39:45 +0000 (15:39 +0200)]
RunManager — don't clear shared RC on loadState

7 years agocleanup
Vladimir Krivosheev [Wed, 15 Oct 2014 12:47:41 +0000 (14:47 +0200)]
cleanup

7 years agocleanup
Vladimir Krivosheev [Wed, 15 Oct 2014 12:31:37 +0000 (14:31 +0200)]
cleanup

7 years agocleanup
Vladimir Krivosheev [Wed, 15 Oct 2014 12:23:29 +0000 (14:23 +0200)]
cleanup

7 years agocleanup
Vladimir Krivosheev [Wed, 15 Oct 2014 12:15:49 +0000 (14:15 +0200)]
cleanup

7 years agojava: correct syntax highlighting for non-Java decompiled files
Roman Shevchenko [Wed, 15 Oct 2014 13:35:43 +0000 (15:35 +0200)]
java: correct syntax highlighting for non-Java decompiled files

7 years agoFixed resolving calls to attributes with the same name of a union type (PY-11364...
Andrey Vlasovskikh [Wed, 15 Oct 2014 13:30:22 +0000 (17:30 +0400)]
Fixed resolving calls to attributes with the same name of a union type (PY-11364, PY-11953)

7 years agoMerge remote-tracking branch 'origin/master' phpstorm/140.131
Ilya.Kazakevich [Wed, 15 Oct 2014 13:18:45 +0000 (17:18 +0400)]
Merge remote-tracking branch 'origin/master'

7 years agoDjango Test fix
Ilya.Kazakevich [Wed, 15 Oct 2014 13:18:02 +0000 (17:18 +0400)]
Django Test fix

7 years agoExtracted PyUtil.multiResolveTopPriority()
Andrey Vlasovskikh [Wed, 15 Oct 2014 13:08:08 +0000 (17:08 +0400)]
Extracted PyUtil.multiResolveTopPriority()

7 years agoRemove old log implementation appcode/140.130
Kirill Likhodedov [Tue, 14 Oct 2014 15:32:16 +0000 (19:32 +0400)]
Remove old log implementation

7 years ago[vcs] Don't require Vcs for ExecutableValidator
Kirill Likhodedov [Fri, 10 Oct 2014 14:14:24 +0000 (18:14 +0400)]
[vcs] Don't require Vcs for ExecutableValidator

Only configurable display name is needed.

7 years ago[log] Simplify "Show Commit on GitHub" from the log
Kirill Likhodedov [Fri, 10 Oct 2014 14:14:24 +0000 (18:14 +0400)]
[log] Simplify "Show Commit on GitHub" from the log

Remove old log references;
Don't create a temp structure for needed data.

7 years ago[tests] Implement GitMockRepositoryManager
Kirill Likhodedov [Fri, 10 Oct 2014 14:14:24 +0000 (18:14 +0400)]
[tests] Implement GitMockRepositoryManager

7 years ago[log] Prohibit actions for external log
Kirill Likhodedov [Fri, 10 Oct 2014 14:14:24 +0000 (18:14 +0400)]
[log] Prohibit actions for external log

Check if the repository is external to the project, and don't allow
such actions as Cherry-Pick, Reset, New Branch.

Additionally rewrite the Cherry-Pick action update() not to consider
the old log.

7 years ago[log] Use separate VcsLogHashMaps for different logs in a single project
Kirill Likhodedov [Fri, 10 Oct 2014 14:14:23 +0000 (18:14 +0400)]
[log] Use separate VcsLogHashMaps for different logs in a single project

Id is a sorted list of root & its vcs.

7 years ago[log] Send refresh events only to the proper instance of the log
Kirill Likhodedov [Fri, 10 Oct 2014 14:14:22 +0000 (18:14 +0400)]
[log] Send refresh events only to the proper instance of the log

Instead of two event mechanism, introduce a single one: post evens
when the VisiblePack is updated. Some clients need to know, whether
the VisiblePack update was triggered by refresh or not, so supply a
flag for them.

7 years ago[log] IDEA-115638, IDEA-124768 Rewrite "Show external log" action
Kirill Likhodedov [Fri, 10 Oct 2014 13:57:36 +0000 (17:57 +0400)]
[log] IDEA-115638, IDEA-124768 Rewrite "Show external log" action

Introduce external repositories to the RepositoryManager.

Let VcsLogManager refresh "simply" if "Show repository log" is called
without a toolwindow (from the welcome screen).

7 years ago[log] Don't make VcsLogManager a project component
Kirill Likhodedov [Fri, 10 Oct 2014 14:28:26 +0000 (18:28 +0400)]
[log] Don't make VcsLogManager a project component

Get an instance from the VcsLogContentProvider.
Later this should be removed, with placing the log to
the file history data context.

7 years ago[log] Fix a typo in data key declaration
Kirill Likhodedov [Fri, 10 Oct 2014 14:26:27 +0000 (18:26 +0400)]
[log] Fix a typo in data key declaration

7 years agoPass vcs roots to the VcsLogManager from the outside
Kirill Likhodedov [Sun, 5 Oct 2014 09:41:42 +0000 (13:41 +0400)]
Pass vcs roots to the VcsLogManager from the outside

7 years agoExtracted PyCallExpressionHelper.getCallTargetReturnType()
Andrey Vlasovskikh [Wed, 15 Oct 2014 12:52:53 +0000 (16:52 +0400)]
Extracted PyCallExpressionHelper.getCallTargetReturnType()

7 years agoIDEA-128779 Spring tool window: the right-most tab should preserve user-defined width
Sergey Malenkov [Wed, 15 Oct 2014 12:23:26 +0000 (16:23 +0400)]
IDEA-128779 Spring tool window: the right-most tab should preserve user-defined width

7 years agoregistry-customizable dfa timeouts, online and offline (IDEA-127984)
peter [Wed, 15 Oct 2014 11:45:07 +0000 (13:45 +0200)]
registry-customizable dfa timeouts, online and offline (IDEA-127984)

7 years agoIDEA-130894 Find usages does not support operators
peter [Wed, 15 Oct 2014 10:47:35 +0000 (12:47 +0200)]
IDEA-130894 Find usages does not support operators

7 years agoExternalAnnotationsLineMarkerProvider: don't blink (return line marker for the same...
peter [Wed, 15 Oct 2014 10:47:13 +0000 (12:47 +0200)]
ExternalAnnotationsLineMarkerProvider: don't blink (return line marker for the same element as queried)

7 years agoEDU-216 Show preview in separate non-editable floating window
Liana Bakradze [Wed, 15 Oct 2014 12:11:55 +0000 (16:11 +0400)]
EDU-216 Show preview in separate non-editable floating window

7 years ago@Nullable
Dmitry Avdeev [Wed, 15 Oct 2014 11:55:18 +0000 (15:55 +0400)]
@Nullable

7 years agopsiFile is no longer required to calculate file color
Egor.Ushakov [Wed, 15 Oct 2014 11:45:11 +0000 (15:45 +0400)]
psiFile is no longer required to calculate file color

7 years ago[git] Update all roots in project if decided by user, even if not all roots were...
Kirill Likhodedov [Wed, 15 Oct 2014 11:34:35 +0000 (15:34 +0400)]
[git] Update all roots in project if decided by user, even if not all roots were specified in the push specification + test

7 years agoRearranger, added support for getters and setter types (part of IDEA-95114)
Yaroslav Lepenkin [Wed, 15 Oct 2014 11:16:36 +0000 (15:16 +0400)]
Rearranger, added support for getters and setter types (part of IDEA-95114)

Introduced CompositeArrangementToken, which stores additional tokens, which are used when sorting ArrangementMatchingRules, to locate "getter" rule before "method" and "method, public" rules.

7 years agogo to action: on/off button for toggle actions, extract some features from option...
Sergey Ignatov [Wed, 15 Oct 2014 10:56:11 +0000 (14:56 +0400)]
go to action: on/off button for toggle actions, extract some features from option providers to ex implementations

7 years agoResourceBundleEditorProvider: findFile() in accept() inside read action
Dmitry Batkovich [Wed, 15 Oct 2014 10:40:06 +0000 (14:40 +0400)]
ResourceBundleEditorProvider: findFile() in accept() inside read action

7 years agoResourceBundleImpl: getFiles() in getPropertiesFiles() inside read action
Dmitry Batkovich [Wed, 15 Oct 2014 10:36:18 +0000 (14:36 +0400)]
ResourceBundleImpl: getFiles() in getPropertiesFiles() inside read action

7 years agoMerge remote-tracking branch 'origin/master'
Ivan Chirkov [Wed, 15 Oct 2014 10:36:27 +0000 (12:36 +0200)]
Merge remote-tracking branch 'origin/master'

7 years agoFix for LibraryJarStatisticsService - wrong url was used to look for settings
Ivan Chirkov [Wed, 15 Oct 2014 10:35:25 +0000 (12:35 +0200)]
Fix for LibraryJarStatisticsService - wrong url was used to look for settings

7 years agomerge unused declaration and unused symbol inspections: missed defaults
Anna Kozlova [Wed, 15 Oct 2014 10:27:47 +0000 (12:27 +0200)]
merge unused declaration and unused symbol inspections: missed defaults

7 years agoEA-61757 inspections table: assertion deleted on checkbox set value if null
Dmitry Batkovich [Wed, 15 Oct 2014 10:27:09 +0000 (14:27 +0400)]
EA-61757 inspections table: assertion deleted on checkbox set value if null

7 years agodisable roaming for AppProperties — some properies are roamable, some not. if it...
Vladimir Krivosheev [Wed, 15 Oct 2014 10:12:44 +0000 (12:12 +0200)]
disable roaming for AppProperties — some properies are roamable, some not. if it will problem for users — such roamable properties must not be stored in this file

7 years agoEA-41614 - assert: CompletionData.objectToLookupItem
Dmitry Avdeev [Wed, 15 Oct 2014 09:53:43 +0000 (13:53 +0400)]
EA-41614 - assert: CompletionData.objectToLookupItem

7 years agoComponentStore save — don't stop save if nested store need to save
Vladimir Krivosheev [Wed, 15 Oct 2014 09:43:35 +0000 (11:43 +0200)]
ComponentStore save — don't stop save if nested store need to save

7 years agoIDEA-126958 Syntax-coloured copying: TODOs color are ignored
Dmitry Batrak [Wed, 15 Oct 2014 09:42:01 +0000 (13:42 +0400)]
IDEA-126958 Syntax-coloured copying: TODOs color are ignored

partial solution - default TODO color settings will be used (from color scheme)

7 years agoincrease version
Dennis Ushakov [Wed, 15 Oct 2014 09:36:36 +0000 (13:36 +0400)]
increase version

7 years agoNPE
Konstantin Bulenkov [Wed, 15 Oct 2014 09:34:23 +0000 (11:34 +0200)]
NPE

7 years agoIDEA-113773 Welcome Screen: no way to correct search query in recent project panel...
Konstantin Bulenkov [Tue, 14 Oct 2014 11:29:46 +0000 (13:29 +0200)]
IDEA-113773 Welcome Screen: no way to correct search query in recent project panel, because Backspace deletes projects now

7 years agodiagnostics for EA-41614 - assert: CompletionData.objectToLookupItem
Dmitry Avdeev [Wed, 15 Oct 2014 09:26:11 +0000 (13:26 +0400)]
diagnostics for EA-41614 - assert: CompletionData.objectToLookupItem

7 years agocleanup
Dmitry Avdeev [Wed, 15 Oct 2014 09:06:18 +0000 (13:06 +0400)]
cleanup

7 years agoduplication removed
Dmitry Avdeev [Wed, 15 Oct 2014 09:04:33 +0000 (13:04 +0400)]
duplication removed

7 years agocleanup
Dmitry Avdeev [Wed, 15 Oct 2014 09:00:27 +0000 (13:00 +0400)]
cleanup

7 years agosimplify — move startSave to ExternalizationSession and rename to createSaveSession
Vladimir Krivosheev [Wed, 15 Oct 2014 08:42:55 +0000 (10:42 +0200)]
simplify — move startSave to ExternalizationSession and rename to createSaveSession

7 years agoIDEA-131126 Selection coloring gets an excessive offset on editor left margin on 139
Egor.Ushakov [Wed, 15 Oct 2014 08:39:39 +0000 (12:39 +0400)]
IDEA-131126 Selection coloring gets an excessive offset on editor left margin on 139

7 years agotests fixed
Alexey Kudravtsev [Wed, 15 Oct 2014 08:25:42 +0000 (12:25 +0400)]
tests fixed

7 years agoDirectoryBasedStorage save: compare using model, but not serialized content
Vladimir Krivosheev [Wed, 15 Oct 2014 07:16:13 +0000 (09:16 +0200)]
DirectoryBasedStorage save: compare using model, but not serialized content

7 years agoUnit test
Stiver [Wed, 15 Oct 2014 06:35:45 +0000 (08:35 +0200)]
Unit test

7 years ago@Nullable
Vladimir Krivosheev [Mon, 13 Oct 2014 13:58:41 +0000 (15:58 +0200)]
@Nullable

7 years agoreinit component if component storage is changed
Vladimir Krivosheev [Mon, 13 Oct 2014 12:56:59 +0000 (14:56 +0200)]
reinit component if component storage is changed

7 years agoActivated bytecode-to-source mapping for all instructions
Stiver [Wed, 15 Oct 2014 04:26:49 +0000 (06:26 +0200)]
Activated bytecode-to-source mapping for all instructions

7 years agoMerge remote-tracking branch 'origin/master' clion/140.128 dbe/140.127 idea/140.122 phpstorm/140.126 pycharm/140.123 rubymine/140.124 webstorm/140.125
Ilya.Kazakevich [Tue, 14 Oct 2014 19:35:59 +0000 (23:35 +0400)]
Merge remote-tracking branch 'origin/master'

7 years agoPY-14081 Django: QuerySet.as_manager() code editing is really slow
Ilya.Kazakevich [Tue, 14 Oct 2014 19:32:38 +0000 (23:32 +0400)]
PY-14081 Django: QuerySet.as_manager() code editing is really slow
Context cache added

7 years agoRuby support for UpSource rubymine/140.120
Anna Bulenkova [Tue, 14 Oct 2014 18:52:49 +0000 (20:52 +0200)]
Ruby support for UpSource

7 years ago+some eslint keywords
Sergey Simonchik [Tue, 14 Oct 2014 17:57:14 +0000 (21:57 +0400)]
+some eslint keywords

7 years agoMerge remote-tracking branch 'origin/master'
Anna Kozlova [Tue, 14 Oct 2014 17:34:19 +0000 (19:34 +0200)]
Merge remote-tracking branch 'origin/master'

7 years agomerge unused declaration and unused symbol inspections: fix save order
Anna Kozlova [Tue, 14 Oct 2014 17:33:18 +0000 (19:33 +0200)]
merge unused declaration and unused symbol inspections: fix save order

7 years agoDBE: use LineTokenizer instead of regular expressions in cell rendering
Sergey Savenko [Tue, 14 Oct 2014 17:10:24 +0000 (21:10 +0400)]
DBE: use LineTokenizer instead of regular expressions in cell rendering

7 years agodependency violation inspection speedup (IDEA-127984)
peter [Tue, 14 Oct 2014 17:07:45 +0000 (19:07 +0200)]
dependency violation inspection speedup (IDEA-127984)

7 years agouse alt+enter for adding eval expression to watches and preserve expression when...
Egor.Ushakov [Tue, 14 Oct 2014 16:59:25 +0000 (20:59 +0400)]
use alt+enter for adding eval expression to watches and preserve expression when switching modes

7 years agoMerge remote-tracking branch 'origin/master'
Roman Shevchenko [Tue, 14 Oct 2014 16:36:49 +0000 (18:36 +0200)]
Merge remote-tracking branch 'origin/master'

7 years agoMerge remote-tracking branch 'origin/master'
Roman Shevchenko [Tue, 14 Oct 2014 16:36:07 +0000 (18:36 +0200)]
Merge remote-tracking branch 'origin/master'

7 years agoMerge branch 'master' of git.labs.intellij.net:idea/community
Elizaveta Shashkova [Tue, 14 Oct 2014 16:35:46 +0000 (20:35 +0400)]
Merge branch 'master' of git.labs.intellij.net:idea/community

7 years agojava-decompiler: do not indent log by unprinted messages
Roman Shevchenko [Tue, 14 Oct 2014 16:33:37 +0000 (18:33 +0200)]
java-decompiler: do not indent log by unprinted messages

7 years agomerge pydev_debugger
Elizaveta Shashkova [Tue, 14 Oct 2014 15:51:58 +0000 (19:51 +0400)]
merge pydev_debugger

7 years agoEA-41231 (omit synthetic inner class constructor parameter)
Roman Shevchenko [Tue, 14 Oct 2014 16:32:15 +0000 (18:32 +0200)]
EA-41231 (omit synthetic inner class constructor parameter)

7 years agomerge unused declaration and unused symbol inspections; leave untouched if new inspec...
Anna Kozlova [Tue, 14 Oct 2014 16:25:46 +0000 (18:25 +0200)]
merge unused declaration and unused symbol inspections; leave untouched if new inspection settings were not modified