Snapshot e2750ea61032f2a041cb012bb7b90cffa0deba73 from idea/133.124 of git://git.jetbrains.org/idea/community.git

e2750ea: plugin advertiser: filtering fixed
1cf8df9: [log] Fix possible race conditions in "Containing branches"
76b348c: [log] Don't display "Loading..." immediately, let a 300ms delay
25089af: [log] Show details panel by default (as it were in the old log) (cherry picked from commit 7ad802c)
b1973f8: [log] More clear name for "Go To Ref" action (cherry picked from commit 73ae4b2)
5883fdd: [log] No need in "Copy Hash" action on the toolbar (cherry picked from commit 4d1e0c0)
686274a: [log] Don't hide "Go to ref" action when focus is not in the log
097f3f6: [log] IDEA-116470 Show "Contained in branches:" information in details
2d1d474: [log] extract SequentialLimitedLifoExecutor from DataGetter for reuse (cherry picked from commit 55ad98c)
e99b08b: [git] Update the widget content on click.
22c88dc: Merge remote-tracking branch 'origin/133' into 133
8012a5f: svn: Implemented "Integrate Directory" action for command line (cherry picked from commit d86de0f)
f3a11c0: svn: Added useAncestry option support to merge client (cherry picked from commit 2539615)
6893301: svn: Implemented "Integrate to Branch" for command line for the case when only some changes of revision are integrated (cherry picked from commit 5fdcd75)
569b12e: svn: Implemented support to copy files from repository to working copy (cherry picked from commit 6abd8f1)
153ae19: svn: Updated merge command for command line - ensured working directory used in output parsing corresponds to process working directory (cherry picked from commit 456ed31)
801bd9a: svn: Added event handler support to delete client (cherry picked from commit ba4ff98)
ee2adfa: svn: Added dryRun option support to delete client (cherry picked from commit aacc6af)
d71dd88: svn: Implemented "Integrate to Branch" for command line for the case when all changes of revision are integrated (cherry picked from commit 5f0fae5)
ac66478: EA-51314 - Throw process start exception right in CommandExecutor.start() (without catching it and rethrowing later) (cherry picked from commit fb27e2c)
fa0d29f: svn: @NotNull for client factories in SvnVcs (cherry picked from commit 5b4cb26)
db0f895: IDEA-112787 Use peg revision when retrieving file content for given revision (as file url could not exist in repository anymore) (cherry picked from commit 9c46aac)
51ac252: IDEA-113732 Handled https 'certificate issued for a different hostname, issuer is not trusted' error for command line using SVNKit authentication lifecycle (cherry picked from commit ca01868)
f071357: IDEA-114717 Combined supported formats for upgrade action from both svnkit and cmd client factories (cherry picked from commit c4af687)
49aa965: IDEA-113533 Combined supported formats for "share directory" from both svnkit and cmd client factories (cherry picked from commit 1ec26a7)
dacf95f: IDEA-114718 Combined supported formats for checkout from both svnkit and cmd client factories (cherry picked from commit ccbb1fc)
ba55a25: IDEA-113730 Reverted CmdContentClient implementation back - as export could not be used to get contents of scheduled for deletion file (cherry picked from commit 1baa4fa)
5bb0f15: IDEA-113730 Implemented content retrieval using export command (this eliminates encoding issues and correctly handle binary formats) (cherry picked from commit 30efd4e)
2136a71: svn: Unify credentials caching in memory logic for ssh and other protocols (cherry picked from commit 276f65a)
28dce65: IDEA-113860 Display dialog if credentials for certain repository are asked more than one time during single command execution (treat such situation as "previous credentials were wrong") (cherry picked from commit f9904cc)
a0637d3: svn: Refactored "svn process finished" logic in CommandRuntime (method extractions) (cherry picked from commit 115f30b)
a91376e: Python plugin for IDEA 13 CE
31bdea8: new inference: cache functional type to check
a9669b2: respect search scope searching for constructor refs
a341be1: new inference: lift containing class type parameters for method references
3a9e65e: IDEA-115275 (bundle compiler migrated from VFS to plain files)
fd8ffc5: introduce multi-token nextTokenIs()
ecf98a2: introduce boolean empty_element_parsed_guard_()
c00e81a: introduce current_position_()
8e353b8: inverse COLLAPSE handling & sync GPUB with GK version
a9173e8: new inference: raise a error when function type was not inferred (supposing well-formed type as free from wildcards)
6e88ca6: wildcards inside: fix for intersection types [^roma]
9e70662: new inference: propagate calculated substitutor to use in B3 reduction process
bde1932: new inference: do not incorporate during B1 phase; TypeCompatibilityConstraint reduces to true for raw substitution and erase in this case method return type
acb87d8: platform: partial refresh fixed
a1f2815: temporary tests fix
fbc56542: Some html contains wrong width and height for images
3b39cc8: don't let parentheses interfere with the "Redundant 'if' statement" inspection results (cherry picked from commit ea1016c)[CR-IC-3339]
fc3a9e3: IDEA-116596 (New inspection: Exception printed using System.out.println()) (cherry picked from commit 6cf0e03)[CR-IC-3341]
dc4bae4: fix typo (cherry picked from commit 7951492)[CR-IC-3343]
d137dec: EA-50192 (IOOBE: CharArrayCharSequence.<init>) (cherry picked from commit d006433)[CR-IC-3345]
2013518: EA-51155 (IOOBE: CharArrayCharSequence.<init>) (cherry picked from commit 0c6d5f0)[CR-IC-3345]
a8cfb98: EA-52004 (NPE: CyclicClassDependencyInspection.checkElement) (cherry picked from commit 148ca98)[CR-IC-3347]
141df67: Do not initialize docks in test mode
0f50ba8: plugins advertiser: ensure that installed plugin is not suggested (IDEA-116927)
ddadbb2: plugin advertiser: suggest ultimate edition for bound plugins
4f8711f: NPE
c56f91b: quickfix name (IDEA-116639)
48a86f0: new inference: testdata to prevent regression
0ca55f1: IDEA-116497 UI hang during index update [r=Eugene.Zhuravlev] (cherry picked from commit c12b687)
5538a24: IDEA-116929 [regression] Ant: after rewriting to DOM API create target quick fix is missing
1c6e2fa: fix one exception from IDEA-116497
02211ff: Merge remote-tracking branch 'origin/133' into 133
b62b0c7: advance bomb
1eaa394: enable softwraps for the text viewer
f231438d3: don't search classes if there is dot in pattern
94066df: check 'idea.java.redist' property set to 'bundled-jdk' to distinguish patch for installation package with jdk from installation package without (cherry picked from commit 24bb6f8) [r=Roman.Shevchenko]
982cf87: Merge remote-tracking branch 'origin/133' into 133
6b7cf43: added idea.java.redist to the Info.plist
d5e07c9: add examples to description (cherry picked from commit 239c72d)[CR-IC-3295]
6065680: clarify description (cherry picked from commit d2b8150)[CR-IC-3295]
a14e046: clarify problem description (cherry picked from commit 1b9ba24)[CR-IC-3295]
ca07b18: replacing an infinite do-while loop with a while loop shouldn't use trickery (cherry picked from commit a4236bf)[CR-IC-3302]
e0222e7: tweak search match drawing on retina a little more room at the top for letters like 'l' and 'b' a little less room at the right side so the next letter is not overlapped (cherry picked from commit fc91f19)[CR-IC-3294]
2fe10c3: IDEA-112242 (Improve Suspicious Array Cast) (cherry picked from commit 2aff3c0)[CR-IC-3297]
26bb782: replacing infinite while loop with do-while doesn't need 'if' (cherry picked from commit 4403959)[CR-IC-3292]
cee6e05: Retina for toolwindow icons
67ba106: Retina for general icons
d390d6a: update threads icons
6aab513: IDEA-116318 Mercurial Log: on very first context menu invocation NewBranch etc actions are available
3dde521: [log] IDEA-116100 Fix Splitter leaks. (cherry picked from commit be23034)
7af7a77: [log] IDEA-116267 files -> items in the structure filter (cherry picked from commit f04ec34)
ac02087: IDEA-116862 Added Maven Dependency (via Quick Fix) added with incorrect scope (cherry picked from commit 5ea19b4) +review CR-IC
6e5d827: better colors
261be38: redesign and add checkbox
0885584: NPE fix
0b81ddc: EA-45917 - IAE: RangeMarkerImpl.<init>
3134d93: introduce rawTokenIndex
7cbf6a4: API cleanup: deprecated methods dropped
7bba66d: revert
f7b6bf3: do not search usages of removed constant fields in injected PSI
b8222b1: Merge remote-tracking branch 'origin/133' into 133
3e2f9b3: FinderRecursivePanel: missing super.dispose() call (cherry picked from commit 3ae7fd7) [Sergey V.]
442ec47: FinderRecursivePanel#hasChildren() -> abstract (cherry picked from commit f61dc40) [Sergey V.]
177e277: NotNull
80f17eb: don't check script inside true html files #WEB-9833 fixed
99e3806: about: scheme handling via web reference #WEB-7451 fixed
b674a63: fix inspired by http://crucible.labs.intellij.net/cru/CR-WS-252#c18049 (cherry picked from commit df14eec) CR-WS-252
baf171d: read access (cherry picked from commit d878e93) CR-WS-252
cdaee33: avoid using WolfTheProblemSolver.hasSyntaxErrors is possible, because it isn't designed to be a public API (cherry picked from commit 7459a38) CR-WS-252
723210d: filter out artificial 'documentChanged' events from FileDocumentManager#saveAllDocuments (cherry picked from commit 3538fec) CR-WS-251
8fdc49b: use Set for myEnabledDescriptors instead of List (as a side effect, not-thread-safe Set implementation is used, so there would be fewer locks) (cherry picked from commit 1685ef9) CR-WS-250
87fb9c6: code simplification (cherry picked from commit 7774de8) CR-WS-250
42f3d39: comment about syntax errors checking added (cherry picked from commit d841051) CR-WS-250
ea171ff: AutoTestManager improvements (cherry picked from commit 81e314d) CR-WS-250
70c6d4f: update tips
d79089c: new icon
be69651: new inference: include containing class params for constructor refs
6f0f160: new inference: testdata
5917752: new inference: incomplete methods ready
e1af6d1: new inference: highlight method refs with incompatible inferred bounds
aaeafcd: new inference: include lifting constraint when parent call is being investigated
705b136: EA-41668 (diagnostic)
ad7d125: RUBY-14570: fixing strings according to proofreading results. (reviewed by Dennis Ushakov) (cherry picked from commit dcbce74)
a6fa4dd: revert changes to fix problem with saving settings when WriteExternalException is thrown
16fa8ed: Merge remote-tracking branch 'origin/133' into 133
77fd50d: add FinderRecursivePanel#isEditable() (cherry picked from commit f4edcef) [Sergey V.]
2c05449: add @since (cherry picked from commit c8a0a87) [Sergey V.]
3cac5cd: add @since (cherry picked from commit 54cd711) [Sergey V.]
3a48f18: turn jump lists on
15e1246: IDEA-116833 External System: clear orphan project libraries (cherry picked from commit 2e9d7fa)
818211a: IDEA-116833 External System: clear orphan project libraries (cherry picked from commit 0bd5325)
bcb50e2: better method naming, assertion conditions correction; reliably process events posted to debugger manager thread on its termination
0a82e6f: green code [^Cébron]
922ecfc: Search fields: native border visual glitch
6aa231d: Merge remote-tracking branch 'origin/133' into 133
d2ee881: IDEA-111161 Flat tool window design[reviewed by kb]
7058df1: test added
e6ca2e3: IDEA-116727: Excluded library directories: removing a root does not removes its excludes [rev by peter]
c1dcedd: IDEA-116713: Excluded library directories: it's possible to exclude the same directory twice [rev by peter]
891b1a0: IDEA-116708: Excluded library directories in jar: a) show what is excluded; b) allow to include them back [rev by peter]
c9a0bfd: IDEA-115760: Spring: create class intentions should not create class in 'generated sources' roots [rev by Yann]
d7d7c8b: disable 'mark directory as resource root' action for Flex modules (IDEA-114866) [rev by A. Doroshko]
fbb9c55: improved layout of 'setup detected frameworks' dialog (IDEA-73513) [rev by kb]
837fc35: new inference: skip null subtypes
f764e69: new inference: avoid one type parameter inference
47474aa: method refs: take ref type arguments into account
e631676: new inference: accept Object/null type argument equivalence
ff73c51: new inference: do not instantiate vars with upper bounds mix when incomplete substitutor is supposed
b8f99ce: remove unnecessary setting (cherry picked from commit b2f25d8)[CR-IC-3280]
ffaafcd: IDEA-116328 (Method can be variable arity method inspection should not highlight for @Nullable parameters) (cherry picked from commit 1522798)[CR-IC-3280]
bac0808: fit value rectangle
219fda3: simplify visitors (cherry picked from commit eeba354)[CR-IC-3296]
62bb0b6: IDEA-116393 ("java.lang.Error not rethrown" false negative for multi-catch) (cherry picked from commit 13f480a)[CR-IC-3296]
e7a53d8: platform: detect case-only name changes in case-insensitive FS only
b3e535c: Merge remote-tracking branch 'origin/133' into 133
4670ddf: intersection types for PsiTypeVisitor; do not convert intersection type to class type even when no actual substitution is needed
a290c35: lambda: break/continue inside lambda body checks
e94cddb: new inference: temp solution for inexact method refs
04056c0: new inference: infer from thrown exceptions in lambda body
179dfcf: FinderRecursivePanel*Test: split, fix broken commit (cherry picked from commit 62cbb8c) CR-IC-3275
eaeb011: FinderRecursivePanel: cleanup, @Nullable (cherry picked from commit 875ccbd) CR-IC-3276
1898456: test names (cherry picked from commit e90eef2) CR-IC-3275
02fa61b: FinderRecursivePanel*Test: split (cherry picked from commit 62cbb8c) CR-IC-3275
2612e6d: cleanup, assertions (cherry picked from commit a54ff04) CR-IC-3275
426f2cc: IDEA-116731 IntelliJ theme: Database Connections dialog: Scope combobox is too narrow IDEA-116768 IntelliJ theme: text end is too close to combobox button
3061aac: IDEA-116343 IntelliJ theme: selected radio button is misplaced
bd0a4cc: IDEA-116346 IntelliJ theme: comboboxes have darker background
52df353: Gradle: basic detection of test resource folders added (cherry picked from commit 40a3f43)
d00ec91: IDEA-116097 Gradle: Code Completion for dependencies doesn't work inside brackets (cherry picked from commit 874cc0e)
984cdfb: IDEA-97696 Custom tool windows layout is lost on exiting IDE with closed projects
76bab4d: lambda: void-compatibility check for expression's lambda void type conditional
057bd4d: new inference: lift type params from referenced method
c21ac7a: new inference: accept all inexact refs during overload resolution
17ac3a2: consider variable prefixes from code style settings (cherry picked from commit dd2be1e)
ce3afc6: Classes moved
c965483: EA-52111 (diagnostic)
dd54952: unbalanced markers fix and also some sqlite grammar cleanup
cf6d247: Merge remote-tracking branch 'origin/133' into 133
ccacf897: new inference: overload resolution: check return types when method refs are exact
2bbd45e: new inference: overload resolution: check SAM specific withing common specific check
a127d80: constructor refs: forbid raw constructor references with explicit new type args
72a410e: new inference: refinement on generics array creation/forbid wildcards in ClassType qualifier
04d138d: fix user completion popup dimensions + add empty border
2e9decb: turn logging on
c3ba0da: fix color
01322ad: remove border
9311e96: IDEA-116701 ISE at com.intellij.psi.impl.PsiToDocumentSynchronizer.a (cherry picked from commit d7a0fe6) +review CR-IC
586c431: IDEA-116350 IntelliJ theme: file settings tree views colors are misplaced
f025467: don't get compiled file text to diagnose stub-psi mismatch (IDEA-115736) (cherry picked from commit 1ac6cf0)
c9ad9cb: Email info parsing fixed
218e6fc: GitIntegrationEnablerTest changed to java test
7ae0a7f: Show branch name only once in case of multiple heads ( in status bar widget and log branch filter). (cherry picked from commit eb5911c)
2b1dc24: IDEA-116241 filtering by structure  supported in Mercurial log (cherry picked from commit 2155e52)
b656970: Annotation for HgRepoInfo changed (cherry picked from commit 88ad884)
3f1adbe: Parse username and user email if it is possible. (cherry picked from commit 35597e5)
f94b1f7: Problem with annotation user fixed
b799f63: Gradle: update to  Gradle 1.9 (cherry picked from commit 8975b3d)
12f4526: External system: project import builder fix (cherry picked from commit 5b01566)
df6f25d: simplify by extending ActionsTopHitProvider
613c358: + private static final
238d1ba: vcs top hits
ccb7628: bae class for action hits
3ca8354: External system: not serializable com.intellij.util.containers.ContainerUtilRt$EmptyList replaced with Collections.emptyList (cherry picked from commit cb7367d)
7186665: External system: not serializable com.intellij.util.containers.ContainerUtilRt$EmptyList replaced with Collections.emptyList (cherry picked from commit 890c7d0)
742ea95: unchecked generics array creation for method references
c59e6be: lambda: void-compatibility check for expression's lambda refined
aca9abc: new inference: forget old instantiations before reduction (need for incorporation)
983f865: Merge branch '133' of git.labs.intellij.net:idea/community into 133
13dc257: IDEA-115689 - IU-132.844. Heroku AS web app deployment link (cherry picked from commit aad94bb)
40d9d1e: show indexed file names in progress for internal mode
199fb40: IDEA-115702 DomAnchorImpl exception: reverted
37471fd: Merge remote-tracking branch 'origin/133' into 133
83a7df9: Gradle: IDEA-116166 Cannot re-import or refresh gradle project (cherry picked from commit 10dc037)
74e1d12: External system: prepare data in project import builder for import (cherry picked from commit 6880758)
a5479a6b: Gradle: basic codeinsight for Gradle IdeaPlugin script block (cherry picked from commit 95e6103)
2e58f53: Gradle: IDEA-115169 EAP Cardea Gradle Integration does not detect additional source folders (cherry picked from commit 07b62d0)
7b7ef8a: Hides "Use auto-import" checkbox in the "Import Project" dialog.
cc47de8: Gradle: fix issue with Gradle Tooling API classpath inferer (cherry picked from commit 0529611)
cd7f5c9: Gradle: fixed IndexNotReadyException for MavenProjectIndicesManager usage in startup activity (cherry picked from commit d65b254)
029d63b: Gradle: war artifact configuration IDEA-109369 External system: Correct WAR artifact setup on external system config change (cherry picked from commit 9249c20)
7f7ef8c: [log] Improve javadoc (cherry picked from commit 2f3154a)
9ee02d2: [log] Fix one more commit/author time mixture in commit details panel (cherry picked from commit 3611dc0)
e816830: [log] Use commit time instead of author time. Step 4. Update the filter (cherry picked from commit a673c02)
4fdcc92: [log] Use commit time instead of author time. Step 3. Actual change.
f9b1ead: [log] Use commit time instead of author time. Step 2. Renaming.
ea7d884: [log] Using commit time instead of author time. Step 1. Renaming.
deefd68: wait for user input out of read action (IDEA-115944, consequence of IDEA-115258) (cherry picked from commit 7035aa0) [r=Peter.Gromov, Alexey.Kudravtsev, Denis.Fokin]
5e160e1: another fix for EA-49431 - PEBCE: PersistentEnumeratorBase.<init> (cherry picked from commit 5b09102) [r=Peter.Gromov]
c07ba66: EA-51558 - assert: PersistentHashMap.updateValueId (cherry picked from commit f679ad3)
4a52b94: IDEA-115702 DomAnchorImpl exception
b26fd32: avoided using JobLauncher for file downloading (CR-IC-3079) [rev by cdr]
a29c466: IDEA-114804 File types mapped to text are not remapped when corresponding plugin is installed
4a74f25: IDEA-115702 DomAnchorImpl exception: element stubs indexed
90551b1: IDEA-111020 Status bar changes its height when progress is shown
61d37cc: frameworks step removed for Groovy modules
e8700ce: Merge remote-tracking branch 'origin/133' into 133
9c41270: new inference: reject methrefs with inconsistent number of parameters
4869294: eliminate SOE
88a05f0: fix SOE
10eae5d: Merge branch '133' of git.labs.intellij.net:idea/community into 133
7f0473c: IDEA-116521 - Heroku deployment facet: application by sample creation doesn't work (cherry picked from commit 65520cb)
32ab75d: replace obsolete myFileType/lexer-highlighting with ConsoleViewUtil.printAsFileType
58ba5b9: replace obsolete myFileType/lexer-highlighting with ConsoleViewUtil.printAsFileType
849b0ee: Merge remote-tracking branch 'origin/133' into 133
bb08b50: check bounds should ignore recursive substitution also when wildcard is captured
52bf5c3: new inference: raise a conflict for 2 captured wildcards as equality constraints
76727c7: new inference: javac bug registration (JDK-8028503)
7dc1d22: new inference: cleanup
ff37a13: new inference: accept unbounded wildcards
058d446: remove external annotation root duplicates resulting by several modules using the same sdk (cherry picked from commit 5e48524)
d152a96: no completion variants after class name and dot in javadoc (IDEA-116520) (cherry picked from commit 3b6995e)
0de6266: catch unexpected exception
e60df2d: LiveTemplates: Fix broken API (cherry-picked from 496e519)
d6de864: Templates: add diagnostic info (cherry-picked from 01525be)
97ffb4a: IDEA-116271 groovy autocomplete tries to complete in /* */ comments (cherry picked from commit 973fd26) [reviewer=Peter]
3cc8b99: IDEA-115699 Groovy: "Convert to Singleline Literal" intention shouldn't be shown for single-line slashy and dollar-slashy string literals (cherry picked from commit 80755bd) [reviewer=Peter]
3b575e0: IDEA-113152 Groovy: In-Place Introduce Refactoring: PIEAE at GrCodeReferenceElementImpl.multiResolve() (cherry picked from commit f81d6b8) [reviewer=Peter]
b347c77: disable tracing for the release [r=Peter.Gromov]
9e5789e: return back custom maven index restoration upon corruption, only avoid logging exception when persistent enumerator version was upgraded (cherry picked from commit c88b649) [r=Peter.Gromov]
ec5ba24: throw VersionUpdatedException if existing enumerator wasn't dirty, there is no need to report it for example (cherry picked from commit 28e3c0d) [r=Peter.Gromov]
403f9a5: fix NPE [^Ann]
0270a8b: [^peter] simple testdata (cherry picked from commit ab04a9d)
5cba3bf: disposed check
e2be35a: IDEA-116348 IDEA 13 starts with toolbar and Project structure toolbar hidden
fc628f7: remove stack trace
20382de: exception fix
79c1443: extract vars to find NPE
755fa4d: EA-47212 (cherry picked from commit 715d14c)
e0a08ba: cleanup (cherry picked from commit 036e287)
b4cf9ff: EA-51728 (cherry picked from commit 6f31031)
b0465b7: cleanup (cherry picked from commit 50501f2)
e3ac306: import new .iml file into community project (cherry picked from commit 22f4b6a)
0e25bde: switch off content cache (low hit rate) to save some memory
dc1b25b: new inference: array creation notional method; testdata
67c4f18: IDEA-116503 (some improvements to Unix shell scripts)
dbc986a: new inference: method constructor array reference processing
03f17f1: Cleanup (misplaced test data)
47c5ecb: IDEA-115580 (path selector for idea-CE.zip build as part of UE)
8fe7d44: Cleanup (code reuse)
f07bb28: Cleanup (overspecified class)
ba46610: new inference: use policy to pass that params should be lifted without Object assignment
74040e6: Use Condition instead of a BooleanFunction.
7d156be: [git] IDEA-109511 Quick-fix of "Git Add" for tracked files.
034dffc: [log] Remove unused methods & fields
9203746: [log] Better approach to details filtering
259a953: NPE [^roman]
3d028a8: new inference: isValueCompatible check during reduce (IDEA-116548)
d4939f7: extend testdata for IDEA-93587
78c98d7: testdata for IDEA-106670
bd1ca68: testdata for IDEA-116359
263652d: testdata for IDEA-116252
df5240e: IDEA-116503 (line separators in inspect.sh in Mac distributions fixed)
f8ab566: enable new inference for 1.8
d2cbf3f: switch tests on new inference
0f6538f: new inference: array constructor refs are always exact (IDEA-115725)
18c175e: new inference: process type arguments withing bounds
0bce395: lambda: catch exception by SAM method substitution (IDEA-116441)
9270256: testdata for IDEA-116493
d83860b: new inference: preserve the order
34e2bd9: by default use breakpoint location filtering in java files with "java" language only: (IDEA-116518 AspectJ support. Add breakpoint handling)
e4d940a: IDEA-116415 Event log: all notifications before its opening get the timestamp of the opening
9cfb433: set timeout to 30 secs
a2f8611: fixed "enterprise view" providers
80cc211: new inference: unintended raw substitutor
ad536ed: disable tests for a while
1ae5a89: new inference: reject wrong overloaded methods earlier
3a660f4: new inference: merge equals constraints before rejection
a2d6c53: new inference: skip wildcards in SAM return types
f971c6f: new inference: include constraint without input variables first
3624126: new inference: simplify check for call expression
8ce52d2: new inference: do not skip contradicted bounds
7a69368: new inference: input/output variables strictly after spec
a66cfe3: new inference: is poly expression strictly after spec
d157345: new inference: is pertinent to applicability strictly after spec
c1c6e16: new inference: equals/hashcode for final fields only
da23c9e: CR-IC-2986 MessageBuilder (cherry picked from commit dfef0e3)
88d62d0: module util must not depends on Guava (incorrect usage was moved to platform-impl UriUtil) +review (cherry picked from commit c161577)
62c8def: cleanup (cherry picked from commit fcddb47)
6e5e574: continue "open actual script source" extract common code to XSourcePositionWrapper (cherry picked from commit e452798)
715476e: Merge remote-tracking branch 'origin/133' into 133
fa7a25b: fix hardcoded completion popup bg
c3728ef: EA-51231 (diagnostic)
47919e5: Fix broken Grails debug. (cherry picked from commit 778380c) +review CR-IU @gromopetr
141c8d9: IDEA-116324 IDEA 13 compiler uses some old xmx setting
012ef05: Made Run-configuration-related keys public.
1deeedd: [^ann] faster simple accessor folding check (cherry picked from commit d0dbf33)
705ea0c: EA-51924 (log corrupted .jar files)
0bb3b89: IDEA-116422 Tweak "Drag'n'Drop" wording (cherry picked from commit 821627d)
e3e9641: [^jeka] ant create property cosmetics (cherry picked from commit 8d6e8b8)
c5c7aa0: edit contract for the compiled element, not its source (cherry picked from commit ec0ee95)
4c6a3a4: avoid using CharBuffer.subSequence() because its signature is different in jdk6/7 (cherry picked from commit 6516b9a)
628b5e6: test: utility method extracted
cede033: retina support for tips images
a0790d2: move to resources-en
dc27602: make 'No matches' bold (cherry picked from commit baff9f0)
3fc5b39: installer fixes (cherry picked from commit 323d9b1)
06fa0f4: ignore width and height in img tag (cherry picked from commit f39c910)
42de439: fix installer (cherry picked from commit 5222ad0)
684b890: inference testdata fixed
88a43e9: CCE in scala
f8981f9: IDEA-116445 IntelliJ laf: Menu bar is hardly visible on Linux
53c9455: merge AntMissingPropertyInspection into more general AntResolveInspection
c54a1ff: fix typo that broke GeneralCodeFormatterTest
7017ba9: new inference: check all overload methods during return type constraint detection
a14b996: new inference: capture return type to emulate method call expression type
d8c3c25: plugins advertiser: ensure before open files
72dcb6d: new inference: process mutual dependencies
84fe967: IDEA-116362 ignore extension does not work
e7e85da: [by the patch from opticyclic] quick fix to create a property from unresolved property reference (IDEA-57875)
2be66db: IDEA-116431 IntelliJ laf: menu shortcuts are invisible
908d8bb: Merge branch '133' of git.labs.intellij.net:idea/community into 133
0190407: correctly handle inner classes removal
ec424bc: update tips resources
1c1ae34: update camel case in goto tips
4bc25fc: update camel completion tips
96c7ada: update annotations tips
48b5cc7: support for retina and darcula images
4ad79a0: IDEA-116371 (NPE in BrowserUtil fixed)
a83a74a: platform: prematurely deprecated API returned
47bd36d: 133 branch
4496371: testdata
864e969: new inference: infer till B1
d7b4a43: new inference: proper type subtyping
c1bb35e: new inference: extract B1 step
af47d9b: new inference: use type arguments during reduction
8a5dfad: new inference: accept methods in lambda return statements as standalone when they do not depend on lambda params
90580d9: new inference: fair reject Object
95b1490: Cleanup (extra spaces)
2812059: test: FS refresh on Unicode paths
5ab0c45: catch invalid lookup elements early
0d6bff8: consider call & chain elements invalid when substitutor is invalid (EA-47282 - PIEAE: PsiUtilCore.ensureValid)
82791bd: don't display quick doc for invalid lookup element (EA-51188)
98ed246: don't create lookup elements for invalid PSI (EA-49434)
fc45519: cosmetics
80becf8: Merge branch 'svn_18_2'
0645f01: svn: Force checking if command was cancelled before repeating it once again (in case some auth failure)
9134cc6: Merge remote-tracking branch 'origin/master'
0f655ea: Merge remote-tracking branch 'origin/master'
3592fec: Merge branch 'svn_18_2'
0605480: Fix windows path detection for remote files (PY-11303).
5c14653: moving ant-related icons under ant plugin; IDEA-34889 Provide dedicated icon for ANT build.xml files
3c69bd1: disposed check
dad581f: possible NPE fix
1aa7c11: unsupported operation notification
4b56193: add diagnostics for PIEAE in StubBasedPsiElementBase.getContainingFile (EA-48734)
2851c2b: OpenShift integration - logs
8c751be: svn: Do not handle possible authentication errors (from process output) if command was manually cancelled
9fe9708: IDEA-115978 Removed repository url from CommonProxy.myNoProxy when retrieving proxy for command line commands
547d5b7: svn: Added logging for proxy logic (when repository url is null for command)
8c6e9ba: new inference: forget about captured variables
68ca073: logging
3198533: IDEA-116121 Split user name and email
0975a20: test: filter for parasitic events caused by overflow
10e37f5: Merge remote-tracking branch 'origin/master'
c6bc240: correctly attach leading comment to statement list (PY-1909)
03fe0f4: if there happens to be a line break inside a qualified reference, make sure we add an indent (PY-6359)
0ac83c3: Merge branch 'svn_18_2'
2d07493: don't indent comments following a statement list (PY-9542)
330dfc0: "remove trailing blank lines" quickfix (PY-9008)
952f1b8: IDEA-116164 Wrong groovy's formatting for label indents with strings
bfc761d: allow wrapping in imports (PY-9163)
4a8a702: StringBuffer -> StringBuilder
7251fe9: extract method
624729a: WI-14476 When hovering over variable, Expression Evaluation tooltip disappears before I can click the + icon (move ignore_mouse_tracking constant to EditorImpl)
28109ef: test using DocumentFormattingModel
fdfb56f: pass ASTNode at caret to WhiteSpaceFormattingStrategy.adjustWhiteSpaceIfNecessary(); use that to correctly insert \ when a line break is inserted via the document formatting model (PY-10319)
c773e81: IDEA-116240  filtering by date supported in Mercurial Log
edfe3bb: IDEA-116162 Wrong groovy's formatting for Spaces with Regular Expression Operators
1974e82: find file in read action
d19e9dc: WEB-6569 Hide internal Chrome scripts
37ee1dd: Exception: additional logging
ade3e46: PythonEnterHandler walks AST instead of offsets to check if it needs to insert backslash
678ffa7: correct place for formatter tests
8409dd6: IDEA-115703 Groovy: reference to $this is not resolved inside slashy and dollar slashy strings
9b02d5a: test: diagnostic
b5165ed: scrolling by keyboard should work as usual in lookups (IDEA-115199)
7050e7b: java: inspection UI moved to platform
45014ca: Dictionary extended
163e8e9: IDEA-116291 New Mercurial log: Details not correct and garbled
5622082: java: deprecated APIs dropped
32d3d6d: util: deprecated APIs dropped
bc6f090: java: deprecated APIs dropped
1efaeea: platform: deprecated APIs dropped
40e3be3: Disabling menu until resolution of IDEA-116284.
96eff49: IDEA-115877 Pasting code which needs to be imported isn't imported
6c72ccc: IDEA-116161 Wrong groovy's formatting for Blank Lines with Javadoc
0bd5835: prefer tag own attributes over common ones #WEB-9900 fixed
3fb7f32: allow to ignore usages from generated file in 'Safe Delete' (IDEA-97579)
c3f7b37: option not to reformat created groovy file
c3de0e6: option not to reformat created groovy file
95e5095: create new file of groovy file type
66a1e22: GrClassInitializer is a class member
db58121: GroovyPsiElementFactory: create field
7f5b300: introduce DelegatingFormattingModel class; use it for XSLT formatting
020e3eb: svn: Implemented "save authentication" for ssh protocol
bd58f4f: svn: Removed implemented TODO items
a2bfb77: svn: Basic cancel behavior for command line commands
7fe4ee0: svn: Refactored TerminalProcessHandler - method extractions
1749911: svn: terminal: Filter process output before passing it to prompt handlers (mainly for windows platform)
faab75c: svn: terminal: Apply escape codes and \r chars filtering only for windows platform
fae4c58: svn: terminal: Remove only unnecessary \r chars and not all whitespace chars (while processing terminal escape codes)
2146067: svn: Simplified InfoCommandRepositoryProvider implementation - get info only for file targets
36edb63: svn: Fixed exception if repository url is null when executing command under terminal

Change-Id: I93b5894ac792fd3267327870ab50b4503359b5e9

1 files changed, 20 insertions, 20 deletions

diff --git a/native/fileWatcher/fileWatcher3.cpp b/native/fileWatcher/fileWatcher3.cpp
index 905eed7ad175..7e3669ecdec7 100644
--- a/native/fileWatcher/fileWatcher3.cpp
+++ b/native/fileWatcher/fileWatcher3.cpp
@@ -41,13 +41,13 @@ CRITICAL_SECTION csOutput;
 void NormalizeSlashes(char *path, char slash)
 {
 	for(char *p=path; *p; p++)
-		if (*p == '\\' || *p == '/') 
+		if (*p == '\\' || *p == '/')
 			*p = slash;
 }
 
 // -- Watchable root checks ---------------------------------------------------
 
-bool IsNetworkDrive(const char *name) 
+bool IsNetworkDrive(const char *name)
 {
     const int BUF_SIZE = 1024;
     char buffer[BUF_SIZE];
@@ -96,7 +96,7 @@ bool IsWatchable(const char *path)
 
 // -- Substed drive checks ----------------------------------------------------
 
-void PrintRemapForSubstDrive(char driveLetter) 
+void PrintRemapForSubstDrive(char driveLetter)
 {
     const int BUF_SIZE = 1024;
     char targetPath[BUF_SIZE];
@@ -108,7 +108,7 @@ void PrintRemapForSubstDrive(char driveLetter)
     if (result == 0) {
         return;
     }
-    else 
+    else
 	{
         if (targetPath[0] == '\\' && targetPath[1] == '?' && targetPath[2] == '?' && targetPath[3] == '\\')
 		{
@@ -142,7 +142,7 @@ void PrintDirectoryReparsePoint(const char *path)
 	NormalizeSlashes(directory, '\\');
 	if (directory [strlen(directory)-1] != '\\')
 		strcat_s(directory, size, "\\");
-		
+
 	char volumeName[_MAX_PATH];
 	int rc = GetVolumeNameForVolumeMountPointA(directory, volumeName, sizeof(volumeName));
 	if (rc)
@@ -176,17 +176,17 @@ bool PrintMountPointsForVolume(HANDLE hVol, const char* volumePath, char *Buf)
     DWORD dwSysFlags;            // flags that describe the file system
     char FileSysNameBuf[BUFSIZE];
 
-    // Is this volume NTFS? 
+    // Is this volume NTFS?
     GetVolumeInformationA(Buf, NULL, 0, NULL, NULL, &dwSysFlags, FileSysNameBuf, BUFSIZE);
 
-    // Detect support for reparse points, and therefore for volume 
-    // mount points, which are implemented using reparse points. 
+    // Detect support for reparse points, and therefore for volume
+    // mount points, which are implemented using reparse points.
 
     if (! (dwSysFlags & FILE_SUPPORTS_REPARSE_POINTS)) {
        return true;
-    } 
+    }
 
-    // Start processing mount points on this volume. 
+    // Start processing mount points on this volume.
     hPt = FindFirstVolumeMountPointA(
         Buf, // root path of volume to be scanned
         Path, // pointer to output string
@@ -196,7 +196,7 @@ bool PrintMountPointsForVolume(HANDLE hVol, const char* volumePath, char *Buf)
     // Shall we error out?
     if (hPt == INVALID_HANDLE_VALUE) {
 		return GetLastError() != ERROR_ACCESS_DENIED;
-    } 
+    }
 
     // Process the volume mount point.
 	char *buf = new char[MAX_PATH];
@@ -217,7 +217,7 @@ bool PrintMountPoints(const char *path)
 	if (!res) {
         return false;
     }
-   
+
     char buf[BUFSIZE];            // buffer for unique volume identifiers
     HANDLE hVol;                  // handle for the volume scan
 
@@ -265,7 +265,7 @@ void PrintDirectoryReparsePoints(const char *path)
 }
 
 // This is called if we got an ERROR_ACCESS_DENIED when trying to enumerate all mount points for volume.
-// In this case, we walk the directory tree up from each watch root, and look at each parent directory 
+// In this case, we walk the directory tree up from each watch root, and look at each parent directory
 // to check whether it's a reparse point.
 void PrintWatchRootReparsePoints()
 {
@@ -295,7 +295,7 @@ void PrintChangeInfo(char *rootPath, FILE_NOTIFY_INFORMATION *info)
 	}
 	else if (info->Action == FILE_ACTION_MODIFIED)
 	{
-		command = "CHANGE";	
+		command = "CHANGE";
 	}
 	else
 	{
@@ -340,14 +340,14 @@ DWORD WINAPI WatcherThread(void *param)
 	handles [1] = overlapped.hEvent;
 	while(true)
 	{
-		int rcDir = ReadDirectoryChangesW(hRootDir, buffer, buffer_size, TRUE, 
+		int rcDir = ReadDirectoryChangesW(hRootDir, buffer, buffer_size, TRUE,
 			FILE_NOTIFY_CHANGE_FILE_NAME |
-			FILE_NOTIFY_CHANGE_DIR_NAME | 
-			FILE_NOTIFY_CHANGE_ATTRIBUTES | 
+			FILE_NOTIFY_CHANGE_DIR_NAME |
+			FILE_NOTIFY_CHANGE_ATTRIBUTES |
 			FILE_NOTIFY_CHANGE_SIZE |
 			FILE_NOTIFY_CHANGE_LAST_WRITE,
 			NULL,
-			&overlapped, 
+			&overlapped,
 			NULL);
 		if (rcDir == 0)
 		{
@@ -379,7 +379,7 @@ DWORD WINAPI WatcherThread(void *param)
 				PrintEverythingChangedUnderRoot(rootPath);
 			} else {
 				FILE_NOTIFY_INFORMATION *info = (FILE_NOTIFY_INFORMATION *) buffer;
-				while(true) 
+				while(true)
 				{
 					PrintChangeInfo(rootPath, info);
 					if (!info->NextEntryOffset)
@@ -553,6 +553,6 @@ int _tmain(int argc, _TCHAR* argv[])
 
 	MarkAllRootsUnused();
 	UpdateRoots();
-	
+
 	DeleteCriticalSection(&csOutput);
 }