Commit Graph
84592 Commits
Author SHA1 Message Date
anna 0fc3cc484d method duplicates: always preview occurrences 2012-07-04 14:17:08 +02:00
Dennis Ushakov 95da5ea9dd #IDEA-88250 fixed
updated TOD text
2012-07-04 15:16:31 +04:00
Evgeny Pasynkov 00ae28fcae Merge branch 'upsource-master'
Conflicts:
	java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
	plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyBundle.properties
	plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java
2012-07-04 11:48:36 +02:00
Evgeny Pasynkov ec79107c77 Merge branch 'master' into upsource-master
Conflicts:
	build/scripts/libLicenses.gant
	images/src/org/intellij/images/index/ImageInfoIndex.java
	java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
	java/execution/impl/src/com/intellij/execution/actions/AbstractRerunFailedTestsAction.java
	jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
	jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
	jps/jps-builders/src/org/jetbrains/jps/incremental/storage/BuildDataManager.java
	jps/jps-builders/src/org/jetbrains/jps/javac/JavacMain.java
	jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager.java
	jps/jps-builders/src/org/jetbrains/jps/javac/OptimizedFileManager17.java
	jps/model/src/org/jetbrains/jps/idea/IdeaProjectLoader.groovy
	platform/lang-api/src/com/intellij/execution/runners/ExecutionEnvironment.java
	platform/lang-impl/src/com/intellij/codeInsight/editorActions/CopyPasteIndentProcessor.java
	platform/platform-impl/src/com/intellij/featureStatistics/actions/ShowFeatureUsageStatisticsDialog.java
	platform/platform-resources-en/src/messages/ActionsBundle.properties
	platform/util/src/com/intellij/icons/AllIcons.java
	plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java
	plugins/java-i18n/src/com/intellij/spellchecker/LiteralExpressionTokenizer.java
	plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java
	plugins/spellchecker/src/com/intellij/spellchecker/tokenizer/EscapeSequenceTokenizer.java
2012-07-04 11:45:53 +02:00
Maxim.Medvedev d35bfbe0e4 IDEA-88124 Groovy: Code | Generate on a JUnit test class could suggest to create Test, SetUp and TearDown methods 2012-07-04 13:44:18 +04:00
Eugene Zhuravlev c9706cc42b concurrent caches for directory attributes 2012-07-04 11:11:24 +02:00
Ekaterina Tuzova c51d9d7dcb Merge remote-tracking branch 'origin/master' 2012-07-04 12:53:13 +04:00
Ekaterina Tuzova 8e51362814 fixed exception and inner function in copy-paste 2012-07-04 12:47:46 +04:00
peter 0878870c06 Show Image Thumbnails 2012-07-04 10:46:49 +02:00
peter da604db094 check if disposed (EA-37138) 2012-07-04 10:46:48 +02:00
peter 6e864b9cd6 show some decimal parts 2012-07-04 10:46:48 +02:00
nik 4495eeb972 diagnostic for EA-36072 2012-07-04 12:38:21 +04:00
nik bd04bcc1b9 EA-37148 - ISE: SegmentArray.findSegmentIndex 2012-07-04 12:38:20 +04:00
Anton Makeev 741d3c3ac5 Platform: rerun tailed test fixed 2012-07-04 10:33:37 +02:00
nik de12964a33 new project model: sdk references 2012-07-04 09:58:11 +04:00
Eugene Zhuravlev 518c4bcba3 1. utils: asyncDelete utility now returns a Future object
2. external build: before exiting ensure all async deletions are completed
2012-07-03 23:35:14 +02:00
Eugene Zhuravlev 39994e7ad7 fail if configured to run Eclipse compiler and it was not found in classpath 2012-07-03 21:06:00 +02:00
Eugene Zhuravlev 84ba062959 support eclipse compiler in external build (initial) 2012-07-03 20:32:36 +02:00
Eugene Zhuravlev 0f7e18f8b3 rename builder 2012-07-03 20:32:35 +02:00
Eugene Zhuravlev e9717dbf76 save storage format version after successful cleanup 2012-07-03 20:32:34 +02:00
Eugene Zhuravlev 4e1620a81b perform changes check only for type of build 'make' 2012-07-03 20:32:34 +02:00
anna 69b378e597 IDEA-87921 2012-07-03 20:21:21 +02:00
anna 67ba56ff43 unnecessary qualified static usage: check also inner classes (IDEA-87870) 2012-07-03 20:21:20 +02:00
Anton Makeev d452b01380 Junit Icon renamed back 2012-07-03 20:11:30 +02:00
Gregory.Shrago 030aa07cf3 focus handling fix, improved "can insert" detection 2012-07-03 22:01:19 +04:00
peter 842ebc1a64 no mnemonic in description (IDEA-62690) 2012-07-03 19:33:39 +02:00
peter e9317a7ec8 fix groovy intention family name 2012-07-03 19:33:39 +02:00
peter 488b0bc3e2 IDEA-50496 Spellchecker doesn't honor character escapes in Java/Groovy string literals 2012-07-03 19:33:39 +02:00
anna 4b98bf2c5c highlight the only one existent duplicate before replacement (IDEA-87963) 2012-07-03 18:44:24 +02:00
anna 9a6cfe7942 update searchable options for internal use 2012-07-03 18:44:23 +02:00
anna ef27f50046 highlight like unused symbols unnecessary qualifiers and redundancy (IDEA-87539) 2012-07-03 18:44:21 +02:00
Maxim.Mossienko a76fb46bb7 limit image size we are evaluating size, limit is exposed as property
(cherry-picked from 98e0f23)
2012-07-03 20:24:55 +04:00
Maxim.Mossienko db4b0a39d6 ensure last modified stamp for file is changed at least for 2 seconds (Fat32 modified resolution)
(cherry-picked from e541fa7)
2012-07-03 20:24:28 +04:00
Evgeny Pasynkov 2a3869d843 Merge branch 'master' into upsource-master 2012-07-03 18:20:07 +02:00
peter 62c012c05c a better fix for IDEA-88207 Attempt to reopen ipr-based project is rejected with "does not exist" error message 2012-07-03 18:00:12 +02:00
peter 2bd78516ca IDEA-88207 Attempt to reopen ipr-based project is rejected with "does not exist" error message 2012-07-03 17:49:29 +02:00
Sergey Evdokimov d10b1728f6 Bug fix: find pom-4.0.0.xml file in maven3 home. 2012-07-03 19:43:25 +04:00
Sergey Evdokimov 553a49617a Optimization Change THashMap to IdentityHashMap, because equals/hashCode of Library is slow. 2012-07-03 19:43:25 +04:00
irengrig 0054a82ada Merge remote branch 'origin/master' 2012-07-03 19:38:29 +04:00
peter 412d99c463 IDEA-88101 No Menus and Toolbars customization for Project panel when Scope selected 2012-07-03 17:08:09 +02:00
Yann Cébron 846c491fd9 Merge remote-tracking branch 'origin/master' 2012-07-03 16:39:45 +02:00
irengrig 80a723c682 VCS: update/integrate file actions to always be visible (enabled is still calculated by context): for shortcuts in quick lists to be valid 2012-07-03 18:25:31 +04:00
peter 3b176ae6aa IDEA-88147 Add PROJECT_NAME variable to file templates 2012-07-03 16:20:43 +02:00
Eugene Zhuravlev 7df170831b make java compiler's file manager classes eclipse-ready 2012-07-03 16:06:28 +02:00
Eugene Zhuravlev 6e276d798e preparing for EJC integration: implement more specific StandardJavaFileManager 2012-07-03 16:06:27 +02:00
Yann Cébron 84192a368b deprecate com.intellij.openapi.util.text.StringUtil#firstLetterToUpperCase 2012-07-03 16:03:40 +02:00
Maxim Shafirov 86daffebc1 IDEA-87650: Let's have this class deprecated for quite a bit longer (Atlassian connector plugin relies on this). 2012-07-03 18:03:24 +04:00
Sergey Simonchik f0de4426d9 logging on initialization error 2012-07-03 17:36:32 +04:00
Kirill Likhodedov 04692c9067 [tasks] IDEA-87529 Github Task Server: move to Github API v3
* GitHubRepository: use new urls for requests; use GithubApiUtil to make requests; parse JSON answers.
* See http://developer.github.com/v3/issues/ :issues, comments and search sections for the format of requests and responses.
* Move parseDate from PivotalTrackerRepository to TaskUtil and reuse it in GitHubRepository (but generalize it to take a String instead of an Element).
2012-07-03 17:31:33 +04:00
Kirill Likhodedov b241dc8364 [github] [tasks] Move basic methods to work with Github API v3 from GithubUtil to GithubApiUtil in the tasks-core module, so that they are accessible both from github module (which depends on tasks), and from Github issue binding in the tasks.
* Also add a connection timeout, as it is done in BaseRepositoryImpl.
2012-07-03 17:31:33 +04:00