Commit Graph
173278 Commits
Author SHA1 Message Date
nik 910fd3b304 reverted 'remove deprecated doExecute' to fix compatibility with Kotlin plugin 2016-05-30 18:26:49 +03:00
nik c9e8b2e19d build scripts: removed obsolete 'moduleLoader' script 2016-05-30 18:26:49 +03:00
Vladislav.Soroka 3e08f9d7b1 gradle: include tests from dependent modules to test classpath if merged structure used 2016-05-30 18:10:59 +03:00
Dmitry Batkovich 83f58b492f guava type migration: problem descriptor class cast fixed EA-83023 2016-05-30 17:52:04 +03:00
Kirill Likhodedov d4b14d9e9b merge markDirty requests and don't schedule one if nothing is to me marked dirty 2016-05-30 17:46:24 +03:00
Kirill Likhodedov d060c2f5c2 simplify to lambda, and don't wrap into new File() 2016-05-30 17:46:22 +03:00
Kirill Likhodedov 3270061926 use the given path, and detect only isDirectory
Otherwise is causes problem for case-only rename on case-insensitive
systems: findFileByPath searches for the VirtualFile case-insensitively,
and the path of the found file can be not equal to the path supplied
to the method.

IDEA-53175, IDEA-94470
2016-05-30 17:46:21 +03:00
Kirill Likhodedov 19dfe129e6 case-only rename: store paths case-sensitively in dirty scope
Otherwise, if "A" and "a" are marked as dirty on a case-insensitive
system, they are compared by FilePath.equals which is case-insensitive,
and thus only one of these paths are stored in the VcsDirtyScopeImpl.

IDEA-53175, IDEA-94470
2016-05-30 17:46:19 +03:00
Kirill Likhodedov 845f69be36 case-only rename: compare paths sensitively when removing common parents
Otherwise, when "a" and "A" paths are given in the dirty scope,
one of them is missed because "A" startsWith "a",
if compared case-insensitively.

IDEA-53175, IDEA-94470
2016-05-30 17:46:17 +03:00
Kirill Likhodedov 7f29cae5ab IDEA-53175 properly commit case only rename
If there are case only renames selected for commit perform
commit without paths (otherwise it would fail):
1. stage addition/removal of other selected files;
2. check if there are deselected files which are already in index;
3. unstage them via `git reset`
   (a proper warning about that should be show by a CheckinHandler).
4. `git commit` without specifying paths.
5. stage back the changes unstaged on step #3.
2016-05-30 17:46:16 +03:00
Kirill Likhodedov 34206c66dd cleanup: less identation 2016-05-30 17:43:46 +03:00
Kirill Likhodedov 4efdc3e2b8 git test: remove unneeded statement 2016-05-30 17:43:46 +03:00
Kirill Likhodedov 136a9808e4 git test: convert to kotlin 2016-05-30 17:43:46 +03:00
Kirill Likhodedov f497a8a677 git test: rename to kotlin 2016-05-30 17:43:46 +03:00
Kirill Likhodedov 8cba57a6a1 IDEA-53175 use proper mv -f command for case-only rename from IDEA 2016-05-30 17:43:46 +03:00
Alexander Zolotov d0678dad85 Emmet: BEM-panel shouldn't fill whole configurable 2016-05-30 17:00:55 +03:00
peter 2d56c8ad24 IDEA-156772 Some Live Templates lost their "applicable context" IntelliJ 2016.2 EAP 2016-05-30 15:58:43 +02:00
Vassiliy.KudryashovandAleksey Pivovarov bf245a5625 Fix for sticky <Win> key when <Win+1>, <Win+2> are used by Linux window manager (as a windows switcher). 2016-05-30 16:49:44 +03:00
Vladislav.Soroka 263e2926c1 IDEA-156528 [GRADLE] "testCompile" dependency does not include all dependencies in "compile" configuration 2016-05-30 16:38:37 +03:00
Roman Shevchenko 278e7ccf58 Cleanup (minor optimization) 2016-05-30 16:30:39 +03:00
Dmitry Batkovich c2695a2190 properties: unused duplicated class deleted 2016-05-30 16:04:37 +03:00
Vladimir Krivosheev 4b8e6bd9c5 remove deprecated doExecute 2016-05-30 15:02:34 +02:00
Vladimir Krivosheev 2a7f32151b LightPathMacroManagerTest 2016-05-30 14:45:21 +02:00
Egor.Ushakov 813c5a40a5 EA-82431 - NPE: DebugProcessImpl.getAutoRenderer 2016-05-30 15:44:15 +03:00
Alexander Zolotov 7d55ac958e Live Templates: do not wrap tests with write command 2016-05-30 15:42:11 +03:00
Dmitry Avdeev 166dbb6612 versioned PersistentEnumerator/HashMap 2016-05-30 13:54:39 +03:00
Shaverdova Elena 32f1dd203f WI-31892 Template project: Invoke Save action before saving project as a template 2016-05-30 12:23:17 +02:00
Dmitry Batrak cd912a7345 fix highlighting and caret behaviour regression near ligature (IDEA-127539)
related to the way ligatures are represented in a glyph vector when Harfbuzz layout engine is used
2016-05-30 13:19:25 +03:00
Dmitry Batrak ac6d3a4b84 refactor ComplexTextFragmentTest 2016-05-30 13:19:25 +03:00
Maxim.Mossienko 75da42e45c fix index access violation: xmlProperties index was accessed during filetypes index processing 2016-05-30 12:10:01 +02:00
Vladimir Krivosheev 44415a5474 expandMacroMap — system macro should have a higher priority 2016-05-30 12:02:42 +02:00
Vladimir Krivosheev d3ef4ef302 cleanup 2016-05-30 12:02:42 +02:00
Egor.Ushakov 74ff443db6 IDEA-156071 Simple static method renderers are much slower than toString - cache TypeEvaluator result 2016-05-30 12:47:36 +03:00
irengrig 102df7c3d1 OC-13448 Intermittent SOE when processing some BuildSettings 2016-05-30 11:45:30 +02:00
Bas Leijdekkers 4499e41ad9 regex: if java sdk version to use can't be found, use latest version 2016-05-30 11:35:47 +02:00
Gregory.Shrago 46069a5daf ability to setup SDK from local IDEA project: run configuration tweaks 2016-05-30 12:20:15 +03:00
Dmitry Batkovich cb512f1aeb Merge remote-tracking branch 'origin/master' 2016-05-30 11:31:36 +03:00
Dmitry Batkovich 27b0380bcd inspection toolwindow: faster selection restoration 2016-05-30 11:30:12 +03:00
Anna Kozlova 2bedb80d81 overload resolution: don't prefer concrete over abstract if the signatures are not override-equivalent 2016-05-30 11:28:01 +03:00
Anna Kozlova 1d57bb658d EA-82987 - SOE: TitleCapitalizationInspection.getTitleValue 2016-05-30 11:28:01 +03:00
Dmitry Batkovich e21daee91b inspection toolwindow: synchronize tree structure reset; add update by problem for tree while rebuilding IDEA-155839 2016-05-30 11:19:39 +03:00
Gregory.Shrago 37b91cbebf reduce flickering on async editor loading 2016-05-30 10:15:39 +03:00
Gregory.Shrago 1b8787ee28 ability to setup SDK from local IDEA project: add jar://file.jar!/ 2016-05-30 10:04:54 +03:00
Gregory.Shrago 1d93a9c721 ability to setup SDK from local IDEA project 2016-05-30 08:57:00 +03:00
Gregory.Shrago 5087975539 IDEA-CR-10668 repaint to update status-text 2016-05-30 06:53:04 +03:00
Julia Beliaeva 2df6f4620f [file-history] add type parameter 2016-05-30 03:25:57 +03:00
Julia Beliaeva 7b0538e527 [file-history] minor: fix typo 2016-05-30 03:25:50 +03:00
Julia Beliaeva b09ec16b56 [file-history] use method references 2016-05-30 03:25:43 +03:00
Julia Beliaeva 82d91209b1 [file-history] collapse identical catch blocks 2016-05-30 03:25:36 +03:00
Julia Beliaeva aea56de9d5 [file-history] use diamonds 2016-05-30 03:25:29 +03:00