Konstantin Kolosovsky [Mon, 10 Feb 2014 16:07:16 +0000 (20:07 +0400)]
Merge branch 'svn_18_3'
Kirill Likhodedov [Mon, 10 Feb 2014 15:59:40 +0000 (19:59 +0400)]
[git] amend: don't add \n to the commit message
Unfortunately, git log returns the commit message always with \n at
the end.
Therefore there is no way to identify whether it was user who put \n
or it is added by Git.
The workaround is to not substitute commit message,
if it differs only with a trailing \n. It should suite most cases.
Konstantin Kolosovsky [Mon, 10 Feb 2014 15:56:38 +0000 (19:56 +0400)]
svn: Refactored SvnUtil.getFileContents - reuse factory selection logic from SvnVcs
Mikhail Golubev [Mon, 10 Feb 2014 13:29:28 +0000 (17:29 +0400)]
Dispose tree builder in disposeUIResources() to prevent memory leak
Mikhail Golubev [Mon, 10 Feb 2014 12:16:31 +0000 (16:16 +0400)]
Update message about unsupported JIRA version
Konstantin Kolosovsky [Mon, 10 Feb 2014 15:51:44 +0000 (19:51 +0400)]
svn: Implemented command line support to logic that preserves changed svn properties during complex reverts - when package rename is reverted, but child files should not be reverted (child files are not not checked in dialog)
peter [Mon, 10 Feb 2014 14:53:29 +0000 (15:53 +0100)]
spare some memory in vcs log
Vladimir Krivosheev [Mon, 10 Feb 2014 15:43:34 +0000 (16:43 +0100)]
WEB-1171 javascript live console
Konstantin Bulenkov [Mon, 10 Feb 2014 15:10:58 +0000 (16:10 +0100)]
kill duplicates
Max Medvedev [Mon, 10 Feb 2014 15:01:28 +0000 (19:01 +0400)]
IDEA-118234 Closure to SAM coercion: infer generic by SAM return type
Max Medvedev [Mon, 10 Feb 2014 14:55:46 +0000 (18:55 +0400)]
InheritanceUtil: some contracts
Sergey Simonchik [Mon, 10 Feb 2014 15:03:00 +0000 (19:03 +0400)]
mark setPassShellEnvironmentAsParent and isPassShellEnvironmentAsParent deprecated to wait for IDEA-118946
Konstantin Bulenkov [Mon, 10 Feb 2014 14:49:44 +0000 (15:49 +0100)]
support actions history
Max Medvedev [Mon, 10 Feb 2014 14:39:52 +0000 (18:39 +0400)]
mock groovy 2.3
Konstantin Kolosovsky [Mon, 10 Feb 2014 14:01:39 +0000 (18:01 +0400)]
IDEA-116775 Use idea home directory as working directory for "revert" operation (not to block current directory in case of reverting rename/move operations)
Sergey Evdokimov [Mon, 10 Feb 2014 13:21:27 +0000 (17:21 +0400)]
IDEA-120502 Support renamed gmaven-plugin plugin (groovy-maven-plugin)
Kirill Likhodedov [Mon, 10 Feb 2014 12:53:22 +0000 (16:53 +0400)]
[git log] Fix multi-value filter by user
Escaping baskslashes in
7eea76a introduced the problem with "\|"
separator used by Git to allow several users.
Backslashes should be escaped separately for text filter
and user filter: in the latter they should be escaped as well
(to allow a non-likely but possible case with backslash in user name)
before escaping "|".
Kirill Likhodedov [Mon, 10 Feb 2014 10:30:23 +0000 (14:30 +0400)]
[log] can happen during log initialization while the table is empty
=> don't log error, the situation is valid.
Vladislav.Soroka [Mon, 10 Feb 2014 13:08:14 +0000 (17:08 +0400)]
Gradle: war artifact/facet creation fix.
related issues:
http://youtrack.jetbrains.com/issue/IDEA-119187
http://youtrack.jetbrains.com/issue/IDEA-119818
http://youtrack.jetbrains.com/issue/IDEA-120407
Vladimir Krivosheev [Mon, 10 Feb 2014 11:33:00 +0000 (12:33 +0100)]
move js debugger platform up
Konstantin Kolosovsky [Mon, 10 Feb 2014 13:06:47 +0000 (17:06 +0400)]
IDEA-118646 Determine client factory for "revert" operation based on file being reverted (and not only based on project root and settings)
Max Medvedev [Mon, 10 Feb 2014 12:51:36 +0000 (16:51 +0400)]
IDEA-118222 Closure to SAM interface coercion doesn't handle contravariant types correctly
Vladimir Orlov [Mon, 10 Feb 2014 12:50:51 +0000 (16:50 +0400)]
Merge remote-tracking branch 'origin/master'
Vladimir Orlov [Mon, 10 Feb 2014 12:49:08 +0000 (16:49 +0400)]
added openapi.jar as dependency for updater.
Egor.Ushakov [Mon, 10 Feb 2014 12:45:28 +0000 (16:45 +0400)]
IDEA-95952 Debugger tooltip is shown in the incorrect place and overlaps annotation tooltip.
Vladimir Orlov [Mon, 10 Feb 2014 12:44:23 +0000 (16:44 +0400)]
Merge remote-tracking branch 'origin/master'
Vladimir Orlov [Mon, 10 Feb 2014 12:40:38 +0000 (16:40 +0400)]
IDEA-120338 Create log for update to the same place where idea (idea based product) logs are located.
Andrey Vlasovskikh [Mon, 10 Feb 2014 12:34:02 +0000 (16:34 +0400)]
Merge branch 'python-fixes'
Konstantin Bulenkov [Mon, 10 Feb 2014 12:28:33 +0000 (13:28 +0100)]
rename parameters
Andrey Vlasovskikh [Mon, 10 Feb 2014 12:28:04 +0000 (16:28 +0400)]
Disable StringLiteralQuotesAnnotator for multi-PSI files (PY-11658)
Python string literals may be split by other (template) languages in
multi-PSI files resulting in string literals that have unmatched
quotes.
Andrey Vlasovskikh [Mon, 10 Feb 2014 12:25:42 +0000 (16:25 +0400)]
Apply visitor filters for all languages of the view provider (PY-11658)
Python is not necessary the base language of multi-PSI view providers,
nevertheless, we should apply visitor filters.
Andrey Vlasovskikh [Mon, 10 Feb 2014 12:23:47 +0000 (16:23 +0400)]
Allow run indenting processor not only from the beginning of the file (PY-11658)
We assume that multi-PSI files with Python as one of the languages
don't mess with Python indenting too much. Even if they do, we should
be able to highlight indenting problems correctly.
Konstantin Kolosovsky [Mon, 10 Feb 2014 12:23:42 +0000 (16:23 +0400)]
svn: Implemented command line support for SingleCommittedListProvider
peter [Fri, 7 Feb 2014 15:21:06 +0000 (16:21 +0100)]
save RootIndex memory
Denis Fokin [Mon, 10 Feb 2014 11:52:51 +0000 (15:52 +0400)]
IDEA-120528 Minimum size is not applied to VCS Log user filter popup
Egor.Ushakov [Mon, 10 Feb 2014 11:51:41 +0000 (15:51 +0400)]
IDEA-120410 It's not possible to select old values of the variable via mouse
Yann Cébron [Mon, 10 Feb 2014 11:51:18 +0000 (12:51 +0100)]
IDEA-115128 Status bar: exception count font
Egor.Ushakov [Mon, 10 Feb 2014 11:30:06 +0000 (15:30 +0400)]
select value in combobox on action
Sergey Simonchik [Mon, 10 Feb 2014 11:17:04 +0000 (15:17 +0400)]
ensure EDT
Vladimir Krivosheev [Mon, 10 Feb 2014 10:51:27 +0000 (11:51 +0100)]
fix assertion — we must reset settings on family change
Vladimir Orlov [Mon, 10 Feb 2014 10:48:31 +0000 (14:48 +0400)]
Merge remote-tracking branch 'origin/master'
Vladimir Orlov [Mon, 10 Feb 2014 10:44:27 +0000 (14:44 +0400)]
fixed updater logger in accordance with the review's recomendations.
Konstantin Kolosovsky [Mon, 10 Feb 2014 10:19:31 +0000 (14:19 +0400)]
svn: Refactored SingleCommittedListProvider - renames, removed duplication
Konstantin Kolosovsky [Mon, 10 Feb 2014 10:06:06 +0000 (14:06 +0400)]
svn: Fixed SingleCommittedListProvider - use previous logic to check changes size and not just first item
Max Medvedev [Mon, 10 Feb 2014 08:54:53 +0000 (12:54 +0400)]
don't find local variable in extract method
Ekaterina Tuzova [Mon, 10 Feb 2014 08:41:41 +0000 (12:41 +0400)]
Merge remote-tracking branch 'origin/master'
Ekaterina Tuzova [Mon, 10 Feb 2014 08:41:15 +0000 (12:41 +0400)]
proper fix for PY-12052 Can't run django tests with nosetests because of `nose_utils` not found.
Alexey Kudravtsev [Fri, 7 Feb 2014 12:04:48 +0000 (16:04 +0400)]
less dependent on UnusedDeclarationInspection
Alexey Kudravtsev [Fri, 7 Feb 2014 11:05:25 +0000 (15:05 +0400)]
notnull
Alexey Kudravtsev [Fri, 7 Feb 2014 10:03:08 +0000 (14:03 +0400)]
moved to right package
Alexey Kudravtsev [Fri, 7 Feb 2014 09:38:30 +0000 (13:38 +0400)]
moved PostHighlightingPass to analysis
Alexey Kudravtsev [Fri, 7 Feb 2014 09:37:38 +0000 (13:37 +0400)]
cleanup
Alexey Kudravtsev [Fri, 7 Feb 2014 09:10:28 +0000 (13:10 +0400)]
don't rely on SmartPOinterManager to load document
Dmitry Batrak [Mon, 10 Feb 2014 08:00:52 +0000 (12:00 +0400)]
IDEA-120265 Incorrect whitespaces (tab) painting when cursor change position
Eugene Zhuravlev [Mon, 10 Feb 2014 07:48:12 +0000 (11:48 +0400)]
fix NPE
Dmitry Batrak [Mon, 10 Feb 2014 06:58:36 +0000 (10:58 +0400)]
EA-52671 - assert: AbstractMappingStrategy.processFoldRegion
Max Medvedev [Sun, 9 Feb 2014 19:50:13 +0000 (23:50 +0400)]
Groovy: in-place introduce parameter: show parameters to remove in preview
Max Medvedev [Sun, 9 Feb 2014 11:27:17 +0000 (15:27 +0400)]
Groovy: introduce parameter from local variable (both in-place and via dialog)
Max Medvedev [Sat, 8 Feb 2014 15:30:21 +0000 (19:30 +0400)]
Groovy: in-place introduce from variable always process all occurrences
Max Medvedev [Fri, 7 Feb 2014 13:29:06 +0000 (17:29 +0400)]
Groovy: in-place introduce field from local var
Max Medvedev [Fri, 7 Feb 2014 10:33:57 +0000 (14:33 +0400)]
EA-49782 - assert: TextRange.<init>
Max Medvedev [Fri, 7 Feb 2014 09:14:33 +0000 (13:14 +0400)]
Groovy ControlFlowBuilder: additional logging
Max Medvedev [Fri, 7 Feb 2014 09:08:39 +0000 (13:08 +0400)]
Groovy ControlFlowBuilder: make some fields final
Max Medvedev [Fri, 7 Feb 2014 09:00:16 +0000 (13:00 +0400)]
cleanup default option searching
Sergey Simonchik [Sun, 9 Feb 2014 21:08:33 +0000 (01:08 +0400)]
load installed packages in a background thread
Dmitry Trofimov [Sun, 9 Feb 2014 19:44:01 +0000 (20:44 +0100)]
Merge remote-tracking branch 'origin/master'
Dmitry Trofimov [Sun, 9 Feb 2014 10:19:52 +0000 (11:19 +0100)]
Fix a typo (PY-12077).
Sergey Simonchik [Sat, 8 Feb 2014 07:29:21 +0000 (11:29 +0400)]
WEB-10858 File Watchers plugin doesn't work
http://youtrack.jetbrains.com/issue/WEB-10858#comment=27-672181
Maxim.Mossienko [Fri, 7 Feb 2014 21:48:29 +0000 (22:48 +0100)]
this is mostly revert of my last year commit
101e4e4 from 27.03.13 because the change introduced deadlock (IDEA-118827) since clearing stub index needs write lock and we can have read lock already from processingStubs. The reverted change introduced better handling of index corruption: do clearIndex at checkRebuild directly. In current code we only advance index version from checkRebuild and proceed with clear index later on edt (with progress) as it was before.
Maxim.Mossienko [Fri, 7 Feb 2014 20:34:07 +0000 (21:34 +0100)]
fix regress: invalidateIndices shouldn't schedule indexing for nonindexed files, many thanks for Peter.Gromov for help of finding the problem in review sessions
Anna Kozlova [Fri, 7 Feb 2014 20:16:38 +0000 (21:16 +0100)]
pull up: support static methods and interfaces for java 8
Anna Kozlova [Fri, 7 Feb 2014 20:14:26 +0000 (21:14 +0100)]
static methods in interfaces should not have abstract by default
Anna Kozlova [Fri, 7 Feb 2014 18:50:52 +0000 (19:50 +0100)]
presentation (IDEA-120353)
Anna Kozlova [Fri, 7 Feb 2014 18:45:32 +0000 (19:45 +0100)]
invalid assertion for red code removed
Anna Kozlova [Fri, 7 Feb 2014 18:36:05 +0000 (19:36 +0100)]
spi files: do not override std file types (IDEA-120291)
Anna Kozlova [Fri, 7 Feb 2014 18:09:29 +0000 (19:09 +0100)]
new inference: testdata for IDEA-120376
Alexander Lobas [Fri, 7 Feb 2014 18:23:54 +0000 (22:23 +0400)]
JavaFX Scene Builder integration
Alexander Lobas [Fri, 7 Feb 2014 18:07:37 +0000 (22:07 +0400)]
JavaFX Scene Builder integration
Anna Kozlova [Fri, 7 Feb 2014 17:40:44 +0000 (18:40 +0100)]
hide embedded scene builder under "embed.scene.builder" property [https://javafx-jira.kenai.com/browse/RT-35745]
Anna Kozlova [Fri, 7 Feb 2014 17:12:06 +0000 (18:12 +0100)]
new inference: method ref inference: postpone return type inference in case of constructor refs
Anna Kozlova [Fri, 7 Feb 2014 16:18:29 +0000 (17:18 +0100)]
new inference: check containing class type params if they are in bounds
Anna Kozlova [Fri, 7 Feb 2014 13:20:51 +0000 (14:20 +0100)]
new inference: method ref inference cleanup
Anna Kozlova [Fri, 7 Feb 2014 13:13:26 +0000 (14:13 +0100)]
new inference: method constructor inference
Anna Kozlova [Fri, 7 Feb 2014 12:19:03 +0000 (13:19 +0100)]
new inference: method reference inference
Roman Shevchenko [Fri, 7 Feb 2014 15:34:13 +0000 (16:34 +0100)]
Cleanup (test)
Vladimir Krivosheev [Fri, 7 Feb 2014 17:03:14 +0000 (18:03 +0100)]
gwt code server run on module A.
A inherits module B.
Our current file belongs to module B.
So, actual:
http://localhost:9876/sourcemaps/A/com/jetbrains/upsource/frontend/application/client/views/feedView/FeedView.java
expected:
http://localhost:9876/sourcemaps/B/com/jetbrains/upsource/frontend/application/client/views/feedView/FeedView.java
So, we must handle this case, not only library classes
Vladimir Krivosheev [Fri, 7 Feb 2014 15:44:29 +0000 (16:44 +0100)]
It is safe now to deprecate launchBrowser
Vladimir Krivosheev [Fri, 7 Feb 2014 15:40:28 +0000 (16:40 +0100)]
move impl to BrowserLauncher
Vladimir Krivosheev [Fri, 7 Feb 2014 11:06:25 +0000 (12:06 +0100)]
move UrlOpener to platform-api
Vladimir Krivosheev [Fri, 7 Feb 2014 11:00:33 +0000 (12:00 +0100)]
prepare to move UrlOpener to platform-api
Vladimir Krivosheev [Fri, 7 Feb 2014 10:54:12 +0000 (11:54 +0100)]
prepare to move UrlOpener to platform-api
Vladimir Krivosheev [Fri, 7 Feb 2014 10:46:37 +0000 (11:46 +0100)]
extract WebBrowserBase
Vladimir Krivosheev [Fri, 7 Feb 2014 10:45:32 +0000 (11:45 +0100)]
extract WebBrowserBase
Vladimir Krivosheev [Fri, 7 Feb 2014 10:27:37 +0000 (11:27 +0100)]
update since-build
Vladimir Krivosheev [Fri, 7 Feb 2014 10:11:03 +0000 (11:11 +0100)]
remove deprecated BrowsersConfiguration
Vladimir Krivosheev [Fri, 7 Feb 2014 10:09:59 +0000 (11:09 +0100)]
move BrowserFamily to upper level
Vladimir Krivosheev [Fri, 7 Feb 2014 09:57:38 +0000 (10:57 +0100)]
cleanup
Vladimir Krivosheev [Fri, 7 Feb 2014 09:53:50 +0000 (10:53 +0100)]
continue: add "Fix" button — open web browser settings
Vladimir Krivosheev [Fri, 7 Feb 2014 09:48:09 +0000 (10:48 +0100)]
continue: add "Fix" button — open web browser settings
Vladimir Krivosheev [Fri, 7 Feb 2014 09:05:51 +0000 (10:05 +0100)]
extract button.fix resource