Commit Graph

22 Commits

Author SHA1 Message Date
Vladimir Krivosheev
3af0adbff3 playback — use Promise 2018-02-22 16:35:11 +01:00
Vladimir Krivosheev
6df5ba3fcb fix after merge 2016-09-07 08:06:57 +02:00
Alexander Doroshko
1f85600a67 sync Ultimate and Community code style settings 2016-03-01 15:24:13 +03:00
Roman Shevchenko
65e84d33cc [project] code style settings for Kotlin (post-merge cleanup) 2015-10-21 16:12:58 +02:00
Roman Shevchenko
1c7310a118 [project] code style settings for Kotlin 2015-10-20 19:59:52 +02:00
nik
48b9d771cb code style settings: added Kotlin settings with new language ID (old 'jet' settings are temporary kept for compatibility) 2015-10-20 19:36:08 +02:00
Kirill Likhodedov
841826cf5d commit automatical configuration file modification in community project 2015-02-02 16:07:15 +03:00
nik
edda031f69 codeStyleSettings.xml: spaces corrected 2014-09-01 16:17:39 +04:00
nik
005a71a30c set indent size to 2 for kotlin files in IDEA Community project 2014-08-06 15:32:50 +04:00
Eugene Zhuravlev
5c14653dac moving ant-related icons under ant plugin; IDEA-34889 Provide dedicated icon for ANT build.xml files 2013-11-12 20:03:56 +01:00
Roman Shevchenko
3ab0306559 platform: common manifest support extracted 2013-08-17 15:39:46 +04:00
Dmitry Avdeev
2faf6e1051 reverted 2013-07-29 11:35:48 +04:00
Dmitry Avdeev
ba9e5b7582 new jira connector 2013-07-29 11:23:36 +04:00
Roman Shevchenko
ba0bf24fc8 Project files updated by IDEA 2013-06-17 21:59:18 +04:00
Dmitry Lomov
67ba9d8bcb More CoreApplicationEnvironment extensibility 2012-11-19 10:32:47 +01:00
Dmitry Lomov
6d2a815e0d Asynchronizing PsiSearchHelper 2012-11-19 09:31:39 +01:00
Dmitry Lomov
3b213c4105 Asynchronizing PsiSearchHelper, take 1 2012-11-19 09:31:39 +01:00
Dmitry Lomov
eeadbb3098 Asynchronizing PsiSearchHelper 2012-11-12 14:26:30 +01:00
Evgeny Pasynkov
06ce6dc4ee make protected 2012-09-19 12:04:00 +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
Dmitry Avdeev
fc27628d66 moving xml-tests to community 2012-06-01 15:43:49 +04:00
Roman Shevchenko
3621fed30c Code style settings in CE project 2011-12-14 12:49:30 +01:00