Skip to content
GitLab
Commit dcaeb8f8 authored by Eldar Abusalimov's avatar Eldar Abusalimov Committed by intellij-monorepo-bot
Browse files

OC-4061: ApplicationUtil: Make runWithCheckCanceled() return result 

GitOrigin-RevId: 3aa9f23cc5097e644eddf82a4faca669759b4760
parent e68246f3
Hide whitespace changes
Inline Side-by-side
Showing
with 102 additions and 93 deletions
+102 -93
.idea/artifacts/maven_event_listener.xml
+ 1
- 1
View file @ dcaeb8f8
<component name="ArtifactManager">
<artifact type="jar" build-on-make="true" name="maven-event-listener">
<artifact type="jar" name="maven-event-listener">
<output-path>$PROJECT_DIR$/out/artifacts/maven_event_listener</output-path>
<root id="archive" name="maven-event-listener.jar">
<element id="module-output" name="intellij.maven.server.eventListener" />
......
.idea/jarRepositories.xml
+ 0
- 5
View file @ dcaeb8f8
......@@ -46,10 +46,5 @@
<option name="name" value="7f849d18-5038-490f-a93d-226871e8f98c" />
<option name="url" value="https://cache-redirector.jetbrains.com/www.myget.org/F/rd-snapshots/maven" />
</remote-repository>
<remote-repository>
<option name="id" value="e585af2a-f558-424b-a8e6-3a1365d5b046" />
<option name="name" value="e585af2a-f558-424b-a8e6-3a1365d5b046" />
<option name="url" value="https://cache-redirector.jetbrains.com/jetbrains.bintray.com/markdown" />
</remote-repository>
</component>
</project>
\ No newline at end of file
.idea/libraries/Groovy.xml
+ 3
- 3
View file @ dcaeb8f8
<component name="libraryTable">
<library name="Groovy" type="repository">
<properties maven-id="org.codehaus.groovy:groovy-all:2.4.17" />
<properties maven-id="org.codehaus.groovy:groovy-all:2.4.15" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.4.17/groovy-all-2.4.17.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.4.17/groovy-all-2.4.17-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-all/2.4.15/groovy-all-2.4.15-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/Groovy_Eclipse_Batch.xml 0 → 100644
+ 10
- 0
View file @ dcaeb8f8
<component name="libraryTable">
<library name="Groovy-Eclipse-Batch" type="repository">
<properties maven-id="org.codehaus.groovy:groovy-eclipse-batch:2.4.15-01" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/codehaus/groovy/groovy-eclipse-batch/2.4.15-01/groovy-eclipse-batch-2.4.15-01.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/batik_transcoder.xml
+ 18
- 35
View file @ dcaeb8f8
<component name="libraryTable">
<library name="batik-transcoder" type="repository">
<properties maven-id="org.jetbrains.intellij.deps.batik:batik-transcoder:1.12.0-8">
<properties maven-id="org.jetbrains.intellij.deps.batik:batik-transcoder:1.12.0-3">
<exclude>
<dependency maven-id="commons-io:commons-io" />
<dependency maven-id="commons-logging:commons-logging" />
<dependency maven-id="org.apache.xmlgraphics:xmlgraphics-commons" />
<dependency maven-id="xalan:xalan" />
<dependency maven-id="xml-apis:xml-apis" />
<dependency maven-id="xml-apis:xml-apis-ext" />
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-transcoder/1.12.0-8/batik-transcoder-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-awt-util/1.12.0-8/batik-awt-util-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/xmlgraphics-commons/2.3/xmlgraphics-commons-2.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-bridge/1.12.0-8/batik-bridge-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-anim/1.12.0-8/batik-anim-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-parser/1.12.0-8/batik-parser-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-svg-dom/1.12.0-8/batik-svg-dom-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-dom/1.12.0-8/batik-dom-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-css/1.12.0-8/batik-css-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-ext/1.12.0-8/batik-ext-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-gvt/1.12.0-8/batik-gvt-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-svggen/1.12.0-8/batik-svggen-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-util/1.12.0-8/batik-util-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-constants/1.12.0-8/batik-constants-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-xml/1.12.0-8/batik-xml-1.12.0-8.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-transcoder/1.12.0-3/batik-transcoder-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-awt-util/1.12.0-3/batik-awt-util-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-bridge/1.12.0-3/batik-bridge-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-anim/1.12.0-3/batik-anim-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-css/1.12.0-3/batik-css-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-parser/1.12.0-3/batik-parser-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-svg-dom/1.12.0-3/batik-svg-dom-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-dom/1.12.0-3/batik-dom-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-ext/1.12.0-3/batik-ext-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-gvt/1.12.0-3/batik-gvt-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-svggen/1.12.0-3/batik-svggen-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-util/1.12.0-3/batik-util-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-constants/1.12.0-3/batik-constants-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-i18n/1.12.0-3/batik-i18n-1.12.0-3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-xml/1.12.0-3/batik-xml-1.12.0-3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-transcoder/1.12.0-8/batik-transcoder-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-awt-util/1.12.0-8/batik-awt-util-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/xmlgraphics-commons/2.3/xmlgraphics-commons-2.3-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-bridge/1.12.0-8/batik-bridge-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-anim/1.12.0-8/batik-anim-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-parser/1.12.0-8/batik-parser-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-svg-dom/1.12.0-8/batik-svg-dom-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-dom/1.12.0-8/batik-dom-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-css/1.12.0-8/batik-css-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-ext/1.12.0-8/batik-ext-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-gvt/1.12.0-8/batik-gvt-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-svggen/1.12.0-8/batik-svggen-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-util/1.12.0-8/batik-util-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-constants/1.12.0-8/batik-constants-1.12.0-8-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/batik/batik-xml/1.12.0-8/batik-xml-1.12.0-8-sources.jar!/" />
</SOURCES>
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/com_android_tools_sdk_common.xml
+ 3
- 3
View file @ dcaeb8f8
<component name="libraryTable">
<library name="com.android.tools:sdk-common" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.intellij.deps.android.tools:sdk-common:26.3.0-sp1" />
<properties include-transitive-deps="false" maven-id="com.android.tools:sdk-common:26.3.0" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/sdk-common/26.3.0-sp1/sdk-common-26.3.0-sp1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/sdk-common/26.3.0/sdk-common-26.3.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/android/tools/sdk-common/26.3.0-sp1/sdk-common-26.3.0-sp1-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/android/tools/sdk-common/26.3.0/sdk-common-26.3.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/ion.xml
+ 3
- 3
View file @ dcaeb8f8
<component name="libraryTable">
<library name="ion" type="repository">
<properties maven-id="org.jetbrains.intellij.deps:ion-java:1.5.0-1" />
<properties maven-id="com.amazon.ion:ion-java:1.4.0" />
<ANNOTATIONS>
<root url="file://$PROJECT_DIR$/lib/annotations/ion" />
</ANNOTATIONS>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/ion-java/1.5.0-1/ion-java-1.5.0-1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/amazon/ion/ion-java/1.4.0/ion-java-1.4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/intellij/deps/ion-java/1.5.0-1/ion-java-1.5.0-1-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/com/amazon/ion/ion-java/1.4.0/ion-java-1.4.0-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/jediterm_pty.xml
+ 3
- 3
View file @ dcaeb8f8
<component name="libraryTable">
<library name="jediterm-pty" type="repository">
<properties include-transitive-deps="false" maven-id="org.jetbrains.jediterm:jediterm-pty:2.16" />
<properties include-transitive-deps="false" maven-id="org.jetbrains.jediterm:jediterm-pty:2.15" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jediterm/jediterm-pty/2.16/jediterm-pty-2.16.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jediterm/jediterm-pty/2.15/jediterm-pty-2.15.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jediterm/jediterm-pty/2.16/jediterm-pty-2.16-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/jediterm/jediterm-pty/2.15/jediterm-pty-2.15-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/libraries/pty4j.xml
+ 3
- 3
View file @ dcaeb8f8
<component name="libraryTable">
<library name="pty4j" type="repository">
<properties maven-id="org.jetbrains.pty4j:pty4j:0.9.4">
<properties maven-id="org.jetbrains.pty4j:pty4j:0.9.3">
<exclude>
<dependency maven-id="org.jetbrains:annotations" />
<dependency maven-id="com.google.guava:guava" />
......@@ -10,12 +10,12 @@
</exclude>
</properties>
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/pty4j/pty4j/0.9.4/pty4j-0.9.4.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/pty4j/pty4j/0.9.3/pty4j-0.9.3.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/pty4j/purejavacomm/0.0.11.1/purejavacomm-0.0.11.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/pty4j/pty4j/0.9.4/pty4j-0.9.4-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/pty4j/pty4j/0.9.3/pty4j-0.9.3-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/jetbrains/pty4j/purejavacomm/0.0.11.1/purejavacomm-0.0.11.1-sources.jar!/" />
</SOURCES>
</library>
......
.idea/libraries/xmlgraphics_commons.xml 0 → 100644
+ 12
- 0
View file @ dcaeb8f8
<component name="libraryTable">
<library name="xmlgraphics-commons" type="repository">
<properties include-transitive-deps="false" maven-id="org.apache.xmlgraphics:xmlgraphics-commons:2.3" />
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/xmlgraphics-commons/2.3/xmlgraphics-commons-2.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/apache/xmlgraphics/xmlgraphics-commons/2.3/xmlgraphics-commons-2.3-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
.idea/modules.xml
+ 0
- 2
View file @ dcaeb8f8
......@@ -480,7 +480,6 @@
<module fileurl="file://$PROJECT_DIR$/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml" filepath="$PROJECT_DIR$/plugins/ui-designer/jps-plugin/intellij.java.guiForms.jps.iml" />
<module fileurl="file://$PROJECT_DIR$/platform/forms_rt/intellij.java.guiForms.rt.iml" filepath="$PROJECT_DIR$/platform/forms_rt/intellij.java.guiForms.rt.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/java-i18n/intellij.java.i18n.iml" filepath="$PROJECT_DIR$/plugins/java-i18n/intellij.java.i18n.iml" />
<module fileurl="file://$PROJECT_DIR$/java/ide-resources/intellij.java.ide.resources.iml" filepath="$PROJECT_DIR$/java/ide-resources/intellij.java.ide.resources.iml" />
<module fileurl="file://$PROJECT_DIR$/java/java-impl/intellij.java.impl.iml" filepath="$PROJECT_DIR$/java/java-impl/intellij.java.impl.iml" />
<module fileurl="file://$PROJECT_DIR$/java/java-indexing-api/intellij.java.indexing.iml" filepath="$PROJECT_DIR$/java/java-indexing-api/intellij.java.indexing.iml" />
<module fileurl="file://$PROJECT_DIR$/java/java-indexing-impl/intellij.java.indexing.impl.iml" filepath="$PROJECT_DIR$/java/java-indexing-impl/intellij.java.indexing.impl.iml" />
......@@ -528,7 +527,6 @@
<module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-java-tests/intellij.jvm.analysis.java.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests/intellij.jvm.analysis.kotlin.tests.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-kotlin-tests/intellij.jvm.analysis.kotlin.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/jvm/jvm-analysis-tests-api/intellij.jvm.analysis.tests.iml" filepath="$PROJECT_DIR$/jvm/jvm-analysis-tests-api/intellij.jvm.analysis.tests.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/markdown/intellij.markdown.iml" filepath="$PROJECT_DIR$/plugins/markdown/intellij.markdown.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/maven/intellij.maven.iml" filepath="$PROJECT_DIR$/plugins/maven/intellij.maven.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver/common/intellij.maven.artifactResolver.common.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver/common/intellij.maven.artifactResolver.common.iml" />
<module fileurl="file://$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/intellij.maven.artifactResolver.m2.iml" filepath="$PROJECT_DIR$/plugins/maven/artifact-resolver-m2/intellij.maven.artifactResolver.m2.iml" />
......
RegExpSupport/resources/META-INF/RegExpPlugin.xml
+ 1
- 1
View file @ dcaeb8f8
......@@ -20,7 +20,7 @@
<extensions defaultExtensionNs="com.intellij">
<lang.documentationProvider language="RegExp" implementationClass="org.intellij.lang.regexp.RegExpDocumentationProvider"/>
<completion.contributor language="RegExp" implementationClass="org.intellij.lang.regexp.RegExpCompletionContributor"/>
<fileType name="RegExp" implementationClass="org.intellij.lang.regexp.RegExpFileType" extensions="regexp" fieldName="INSTANCE" language="RegExp"/>
<fileTypeFactory implementation="org.intellij.lang.regexp.RegExpSupportLoader" />
<annotator language="RegExp" implementationClass="org.intellij.lang.regexp.validation.RegExpAnnotator"/>
<lang.parserDefinition language="RegExp" implementationClass="org.intellij.lang.regexp.RegExpParserDefinition"/>
<lang.syntaxHighlighterFactory language="RegExp" implementationClass="org.intellij.lang.regexp.RegExpSyntaxHighlighterFactory"/>
......
RegExpSupport/src/org/intellij/lang/regexp/RegExpSupportLoader.java 0 → 100644
+ 31
- 0
View file @ dcaeb8f8
/*
* Copyright 2006 Sascha Weinreuter
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.intellij.lang.regexp;
import com.intellij.openapi.fileTypes.FileTypeConsumer;
import com.intellij.openapi.fileTypes.FileTypeFactory;
import org.jetbrains.annotations.NotNull;
public class RegExpSupportLoader extends FileTypeFactory {
public static final RegExpLanguage LANGUAGE = RegExpLanguage.INSTANCE;
public static final RegExpFileType FILE_TYPE = RegExpFileType.INSTANCE;
@Override
public void createFileTypes(final @NotNull FileTypeConsumer consumer) {
consumer.consume(FILE_TYPE, FILE_TYPE.getDefaultExtension());
}
}
RegExpSupport/src/org/intellij/lang/regexp/intention/CheckRegExpForm.java
+ 2
- 3
View file @ dcaeb8f8
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.intellij.lang.regexp.intention;
import com.intellij.ide.util.PropertiesComponent;
......@@ -31,7 +31,6 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.ui.EditorTextField;
import com.intellij.ui.JBColor;
import com.intellij.ui.components.JBLabel;
import com.intellij.ui.scale.JBUIScale;
import com.intellij.util.Alarm;
import com.intellij.util.ui.JBUI;
import com.intellij.util.ui.UIUtil;
......@@ -110,7 +109,7 @@ public class CheckRegExpForm {
}
};
mySampleText.setOneLineMode(false);
int preferredWidth = Math.max(JBUIScale.scale(250), myRegExp.getPreferredSize().width);
int preferredWidth = Math.max(JBUI.scale(250), myRegExp.getPreferredSize().width);
myRegExp.setPreferredWidth(preferredWidth);
mySampleText.setPreferredWidth(preferredWidth);
......
bin/WinLauncher/WinLauncher.exe 100755 → 100644
+ 0
- 0
View file @ dcaeb8f8
No preview for this file type
bin/WinLauncher/WinLauncher64.exe 100755 → 100644
+ 0
- 0
View file @ dcaeb8f8
No preview for this file type
build/dependencies/build.gradle
+ 0
- 1
View file @ dcaeb8f8
......@@ -5,7 +5,6 @@ buildscript {
}
dependencies {
classpath "de.undercouch:gradle-download-task:3.4.2"
classpath "gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:0.5"
}
}
......
build/dependencies/gradle.properties
+ 3
- 3
View file @ dcaeb8f8
......@@ -3,7 +3,7 @@
kotlinPluginBuild=1.3.31-release-IJ2019.1-1
jetSignBuild=42.30
secondJreVersion=11
secondJreBuild=11_0_3b304.2
bundledMavenVersion=3.6.1
jdkBuild=u212b1586.2
secondJreBuild=11_0_3b262.3
bundledMavenVersion=3.6.0
jdkBuild=u212b1566.8
gradleApiVersion=5.2.1
build/dependencies/setupBundledMaven.gradle
+ 9
- 18
View file @ dcaeb8f8
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
buildscript {
repositories {
maven { url "https://cache-redirector.jetbrains.com/plugins.gradle.org" }
}
dependencies {
classpath "de.undercouch:gradle-download-task:3.2.0"
}
}
apply plugin: "de.undercouch.download"
apply plugin: "org.jetbrains.gradle.plugin.idea-ext"
configurations {
mavenServer3CommonLibs
......@@ -11,8 +18,6 @@ configurations {
maven3Distribution.transitive = false
}
dependencies {
mavenServer3CommonLibs 'org.apache.maven.archetype:archetype-common:2.2'
mavenServer3CommonLibs 'org.apache.maven.archetype:archetype-catalog:2.2'
......@@ -30,7 +35,6 @@ def mavenDistName = "apache-maven-$bundledMavenVersion"
task unpackMavenDistribution(type: Copy) {
from zipTree(project.configurations.maven3Distribution.singleFile)
into "$mavenServerLibDir/maven3"
onlyIf { (!destinationDir.exists()) || destinationDir.list() == null || destinationDir.list().length == 0 }
}
......@@ -39,15 +43,8 @@ task setupCommonLibs(type: Copy) {
into "$communityPluginsDir/maven/maven3-server-common/lib"
}
task deletePreviousMinorVersionIfRequired(type: Delete) {
delete mavenServerLibDir
onlyIf {
new File("$mavenServerLibDir/maven3/lib").exists() && !new File("$mavenServerLibDir/maven3/lib/maven-core-${bundledMavenVersion}.jar").
exists()
}
}
//there is no friendly way to unpack gradle zip without parent dir
task setupBundledMaven(dependsOn: [deletePreviousMinorVersionIfRequired, unpackMavenDistribution, setupCommonLibs], type: Copy) {
task setupBundledMaven(dependsOn: [unpackMavenDistribution, setupCommonLibs], type: Copy) {
def unzippedDir = new File("$mavenServerLibDir/maven3/$mavenDistName")
from fileTree(unzippedDir)
into "$mavenServerLibDir/maven3/"
......@@ -56,9 +53,3 @@ task setupBundledMaven(dependsOn: [deletePreviousMinorVersionIfRequired, unpackM
unzippedDir.deleteDir()
}
}
idea.project.settings {
taskTriggers {
afterSync tasks.getByName("setupBundledMaven")
}
}
build/gant.xml
+ 0
- 9
View file @ dcaeb8f8
......@@ -18,14 +18,6 @@
<equals arg1="${intellij.build.use.gradle.daemon}" arg2="true"/>
</and>
</condition>
<condition property="gradle.args" value="${intellij.gradle.jdk.build.parameters}" else="--stacktrace">
<and>
<isset property="intellij.gradle.jdk.build.parameters"/>
<not>
<equals arg1="${intellij.gradle.jdk.build.parameters}" arg2=""/>
</not>
</and>
</condition>
<condition property="gradlew" value="gradlew.bat" else="gradlew">
<os family="windows"/>
</condition>
......@@ -36,7 +28,6 @@
<env key="JAVA_HOME" value="${java.path}"/>
<arg value="${gradle.daemon}"/>
<arg value="-Djava.io.tmpdir=${java.io.tmpdir}"/>
<arg line="${gradle.args}"/>
<arg value="setupBuildScriptsDeps"/>
</exec>
</target>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

免费DevSecOps平台，让您的项目体验完整的DevSecOps流程，让项目更安全