From 2a0f6f206eaacab09808e6d53c88ed5b3b32a841 Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Tue, 20 Dec 2022 20:48:16 +0100 Subject: [PATCH] New IDEA module kind based on Gradle --- .idea/runConfigurations/IDEA.xml | 11 - .run/Run IDEA plugin.run.xml | 24 + .../main/java/org/teavm/debugging/Value.java | 2 - .../org/teavm/debugging/WasmValueImpl.java | 10 +- pom.xml | 8 +- tools/ide-deps/pom.xml | 113 ++++ tools/idea/.gitignore | 5 + tools/idea/build.gradle.kts | 58 ++ tools/idea/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 60756 bytes .../gradle/wrapper/gradle-wrapper.properties | 5 + tools/idea/gradlew | 234 ++++++++ tools/idea/gradlew.bat | 89 +++ tools/idea/idea-artifacts/.gitignore | 1 - tools/idea/idea-artifacts/dep-pom.xml | 387 ------------- tools/idea/idea-artifacts/pom.xml | 95 --- .../idea-artifacts/teavm-idea-artifacts.iml | 12 - tools/idea/jps-common/.gitignore | 1 - tools/idea/jps-common/pom.xml | 113 ---- .../idea/jps/model/TeaVMJpsConfiguration.java | 138 ----- .../model/TeaVMJpsWorkspaceConfiguration.java | 64 -- .../model/TeaVMModelSerializerService.java | 66 --- .../teavm/idea/jps/model/TeaVMProperty.java | 50 -- .../jps/remote/TeaVMBuilderAssistant.java | 27 - .../idea/jps/remote/TeaVMElementLocation.java | 54 -- tools/idea/jps-common/teavm-jps-common.iml | 26 - tools/idea/jps-plugin/pom.xml | 107 ---- .../teavm/idea/jps/RenamingClassLoader.java | 71 --- .../org/teavm/idea/jps/RenamingVisitor.java | 287 --------- .../java/org/teavm/idea/jps/TeaVMBuild.java | 546 ------------------ .../org/teavm/idea/jps/TeaVMBuildTarget.java | 93 --- .../teavm/idea/jps/TeaVMBuildTargetType.java | 97 ---- .../java/org/teavm/idea/jps/TeaVMBuilder.java | 103 ---- .../teavm/idea/jps/TeaVMBuilderService.java | 38 -- .../java/org/teavm/idea/jps/TeaVMStorage.java | 119 ---- .../teavm/idea/jps/TeaVMStorageProvider.java | 35 -- ...g.jetbrains.jps.incremental.BuilderService | 1 - ....serialization.JpsModelSerializerExtension | 1 - tools/idea/jps-plugin/teavm-jps-plugin.iml | 24 - tools/idea/plugin/pom.xml | 197 ------- tools/idea/plugin/src/assembly/plugin.xml | 56 -- .../org/teavm/idea/TeaVMDaemonComponent.java | 147 ----- .../main/java/org/teavm/idea/TeaVMFacet.java | 29 - .../teavm/idea/TeaVMFacetConfiguration.java | 57 -- .../java/org/teavm/idea/TeaVMFacetType.java | 64 -- .../org/teavm/idea/TeaVMJPSConfigurator.java | 47 -- .../org/teavm/idea/TeaVMJPSRemoteService.java | 151 ----- .../teavm/idea/TeaVMWebAssemblyFacetType.java | 64 -- .../TeaVMWorkspaceConfigurationStorage.java | 38 -- .../java/org/teavm/idea/debug/TeaVMValue.java | 111 ---- .../teavm/idea/maven/TeaVMMavenImporter.java | 167 ------ .../org/teavm/idea/ui/TeaVMConfigurable.java | 75 --- .../idea/ui/TeaVMConfigurationPanel.java | 373 ------------ .../teavm/idea/ui/TeaVMFacetEditorTab.java | 63 -- .../teavm/idea/ui/TeaVMSettingsEditorTab.java | 143 ----- .../src/main/resources/META-INF/maven.xml | 21 - tools/idea/plugin/teavm-idea.iml | 33 -- tools/idea/pom.xml | 50 -- tools/idea/settings.gradle.kts | 1 + .../main/java/org/teavm/idea/DaemonUtil.java | 4 +- .../teavm/idea/DevServerRunnerListener.java | 2 +- .../idea/debug/TeaVMBreakpointProvider.java | 2 +- .../idea/debug/TeaVMDebugConfiguration.java | 4 +- .../debug/TeaVMDebugConfigurationType.java | 2 +- .../teavm/idea/debug/TeaVMDebugProcess.java | 8 +- .../teavm/idea/debug/TeaVMDebugRunner.java | 2 +- .../debug/TeaVMDebuggerEditorsProvider.java | 2 +- .../teavm/idea/debug/TeaVMExecutionStack.java | 2 +- .../debug/TeaVMKotlinBreakpointProvider.java | 2 +- .../debug/TeaVMLineBreakpointHandler.java | 2 +- .../teavm/idea/debug/TeaVMOriginalValue.java | 2 +- .../org/teavm/idea/debug/TeaVMRunState.java | 2 +- .../debug/TeaVMScalaBreakpointProvider.java | 2 +- .../org/teavm/idea/debug/TeaVMStackFrame.java | 2 +- .../teavm/idea/debug/TeaVMSuspendContext.java | 2 +- .../java/org/teavm/idea/debug/TeaVMValue.java | 57 ++ .../debug/ui/TeaVMDebugSettingsEditor.java | 2 +- .../debug/ui/TeaVMDebugSettingsPanel.java | 2 +- .../idea/devserver/DevServerBuildResult.java | 2 +- .../devserver/DevServerConfiguration.java | 2 +- .../teavm/idea/devserver/DevServerInfo.java | 2 +- .../idea/devserver/DevServerManager.java | 2 +- .../devserver/DevServerManagerListener.java | 2 +- .../teavm/idea/devserver/DevServerRunner.java | 2 +- .../TeaVMDevServerConfiguration.java | 4 +- .../TeaVMDevServerConfigurationType.java | 2 +- .../devserver/TeaVMDevServerRunState.java | 6 +- .../idea/devserver/TeaVMDevServerRunner.java | 2 +- .../idea/devserver/TeaVMProcessHandler.java | 2 +- .../devserver/ui/TeaVMDevServerConsole.java | 2 +- .../ui/TeaVMDevServerSettingsEditor.java | 2 +- .../ui/TeaVMDevServerSettingsPanel.java | 2 +- .../src/main/resources/META-INF/kotlin.xml | 0 .../src/main/resources/META-INF/plugin.xml | 18 +- .../src/main/resources/META-INF/scala.xml | 0 .../src/main/resources/teavm-16.png | Bin tools/idea/teavm-idea-parent.iml | 12 - 96 files changed, 630 insertions(+), 4539 deletions(-) delete mode 100644 .idea/runConfigurations/IDEA.xml create mode 100644 .run/Run IDEA plugin.run.xml create mode 100644 tools/ide-deps/pom.xml create mode 100644 tools/idea/.gitignore create mode 100644 tools/idea/build.gradle.kts create mode 100644 tools/idea/gradle/wrapper/gradle-wrapper.jar create mode 100644 tools/idea/gradle/wrapper/gradle-wrapper.properties create mode 100755 tools/idea/gradlew create mode 100644 tools/idea/gradlew.bat delete mode 100644 tools/idea/idea-artifacts/.gitignore delete mode 100644 tools/idea/idea-artifacts/dep-pom.xml delete mode 100644 tools/idea/idea-artifacts/pom.xml delete mode 100644 tools/idea/idea-artifacts/teavm-idea-artifacts.iml delete mode 100644 tools/idea/jps-common/.gitignore delete mode 100644 tools/idea/jps-common/pom.xml delete mode 100644 tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java delete mode 100644 tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMJpsWorkspaceConfiguration.java delete mode 100644 tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java delete mode 100644 tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMProperty.java delete mode 100644 tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMBuilderAssistant.java delete mode 100644 tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMElementLocation.java delete mode 100644 tools/idea/jps-common/teavm-jps-common.iml delete mode 100644 tools/idea/jps-plugin/pom.xml delete mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/RenamingClassLoader.java delete mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/RenamingVisitor.java delete mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java delete mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuildTarget.java delete mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuildTargetType.java delete mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java delete mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java delete mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMStorage.java delete mode 100644 tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMStorageProvider.java delete mode 100644 tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService delete mode 100644 tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension delete mode 100644 tools/idea/jps-plugin/teavm-jps-plugin.iml delete mode 100644 tools/idea/plugin/pom.xml delete mode 100644 tools/idea/plugin/src/assembly/plugin.xml delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMDaemonComponent.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacet.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacetConfiguration.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacetType.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMJPSConfigurator.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMJPSRemoteService.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMWebAssemblyFacetType.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMWorkspaceConfigurationStorage.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMValue.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/maven/TeaVMMavenImporter.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMConfigurable.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMConfigurationPanel.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMFacetEditorTab.java delete mode 100644 tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMSettingsEditorTab.java delete mode 100644 tools/idea/plugin/src/main/resources/META-INF/maven.xml delete mode 100644 tools/idea/plugin/teavm-idea.iml delete mode 100644 tools/idea/pom.xml create mode 100644 tools/idea/settings.gradle.kts rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/DaemonUtil.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/DevServerRunnerListener.java (95%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMBreakpointProvider.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMDebugConfiguration.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMDebugConfigurationType.java (98%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java (95%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMDebugRunner.java (98%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMDebuggerEditorsProvider.java (97%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMExecutionStack.java (98%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMKotlinBreakpointProvider.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMLineBreakpointHandler.java (99%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMOriginalValue.java (98%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMRunState.java (98%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMScalaBreakpointProvider.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMStackFrame.java (99%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/TeaVMSuspendContext.java (97%) create mode 100644 tools/idea/src/main/java/org/teavm/idea/debug/TeaVMValue.java rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsEditor.java (97%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsPanel.java (98%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/DevServerBuildResult.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/DevServerConfiguration.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/DevServerInfo.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/DevServerManager.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/DevServerManagerListener.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/DevServerRunner.java (99%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfiguration.java (98%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfigurationType.java (98%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunState.java (96%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunner.java (99%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/TeaVMProcessHandler.java (98%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerConsole.java (99%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsEditor.java (98%) rename tools/idea/{plugin => }/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsPanel.java (99%) rename tools/idea/{plugin => }/src/main/resources/META-INF/kotlin.xml (100%) rename tools/idea/{plugin => }/src/main/resources/META-INF/plugin.xml (63%) rename tools/idea/{plugin => }/src/main/resources/META-INF/scala.xml (100%) rename tools/idea/{plugin => }/src/main/resources/teavm-16.png (100%) delete mode 100644 tools/idea/teavm-idea-parent.iml diff --git a/.idea/runConfigurations/IDEA.xml b/.idea/runConfigurations/IDEA.xml deleted file mode 100644 index 89a67c4c6..000000000 --- a/.idea/runConfigurations/IDEA.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.run/Run IDEA plugin.run.xml b/.run/Run IDEA plugin.run.xml new file mode 100644 index 000000000..6bdd272a0 --- /dev/null +++ b/.run/Run IDEA plugin.run.xml @@ -0,0 +1,24 @@ + + + + + + + + true + true + false + + + \ No newline at end of file diff --git a/core/src/main/java/org/teavm/debugging/Value.java b/core/src/main/java/org/teavm/debugging/Value.java index cce44721b..051bdb186 100644 --- a/core/src/main/java/org/teavm/debugging/Value.java +++ b/core/src/main/java/org/teavm/debugging/Value.java @@ -16,13 +16,11 @@ package org.teavm.debugging; import java.util.Map; -import org.teavm.backend.wasm.debug.info.DebugInfo; import org.teavm.common.Promise; import org.teavm.debugging.javascript.JavaScriptValue; public abstract class Value { Debugger debugger; - private DebugInfo wasmDebugInfo; private Promise> properties; private Promise type; diff --git a/core/src/main/java/org/teavm/debugging/WasmValueImpl.java b/core/src/main/java/org/teavm/debugging/WasmValueImpl.java index 844b58699..f7f5e3b90 100644 --- a/core/src/main/java/org/teavm/debugging/WasmValueImpl.java +++ b/core/src/main/java/org/teavm/debugging/WasmValueImpl.java @@ -480,15 +480,7 @@ class WasmValueImpl extends Value { @Override public Promise hasInnerStructure() { - return getCalculatedType().then(type -> { - switch (type.kind()) { - case CLASS: - case ARRAY: - return true; - default: - return false; - } - }); + return Promise.of(type == FieldType.OBJECT && longValue != 0); } @Override diff --git a/pom.xml b/pom.xml index 79f274eba..feb713541 100644 --- a/pom.xml +++ b/pom.xml @@ -90,8 +90,6 @@ 2.12.2 2.8.6 - 2018.2.8 - 3.3.3 3.3 @@ -415,12 +413,12 @@ - with-idea + with-ide-deps - tools/idea + tools/ide-deps - + with-eclipse diff --git a/tools/ide-deps/pom.xml b/tools/ide-deps/pom.xml new file mode 100644 index 000000000..d8db62ff9 --- /dev/null +++ b/tools/ide-deps/pom.xml @@ -0,0 +1,113 @@ + + + + + + + org.teavm + teavm + 0.7.0-SNAPSHOT + ../../pom.xml + + 4.0.0 + + teavm-ide-deps + TeaVM fat JAR for IDEs + + + + org.teavm + teavm-tooling + ${project.version} + + + org.teavm + teavm-devserver + ${project.version} + + + org.teavm + teavm-classlib + ${project.version} + + + org.teavm + teavm-chrome-rdp + ${project.version} + + + + + + + org.apache.maven.plugins + maven-shade-plugin + ${maven-shade-plugin.version} + + + package + + shade + + + + + com.jetbrains.intellij.idea:ideaIC:zip:* + joda-time:joda-time + + + true + + + com.google.gson + org.teavm.shade.gson + + + com.jcraft.jzlib + org.teavm.shade.jzlib + + + org.eclipse.jetty + org.teavm.shade.jetty + + + org.joda.time + org.teavm.shade.jodatime + + + org.objectweb.asm + org.teavm.shade.jetty.asm + + + org.slf4j + org.teavm.shade.slf4j + + + org.apache.commons + org.teavm.apachecommons + + + + + + + + + + \ No newline at end of file diff --git a/tools/idea/.gitignore b/tools/idea/.gitignore new file mode 100644 index 000000000..bb64e44d1 --- /dev/null +++ b/tools/idea/.gitignore @@ -0,0 +1,5 @@ +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ diff --git a/tools/idea/build.gradle.kts b/tools/idea/build.gradle.kts new file mode 100644 index 000000000..6f5a83ba5 --- /dev/null +++ b/tools/idea/build.gradle.kts @@ -0,0 +1,58 @@ +/* + * Copyright 2022 Alexey Andreev. + * + * 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. + */ + +plugins { + id("java") + id("checkstyle") + id("org.jetbrains.intellij") version "1.10.1" +} + +group = "org.teavm" +version = "0.7.0-SNAPSHOT" + +repositories { + mavenCentral() + mavenLocal() +} + +intellij { + version.set("2020.1.4") + type.set("IC") // Target IDE Platform + + plugins.set(listOf("java", "org.intellij.scala:2020.1.43", "org.jetbrains.kotlin")) +} + +checkstyle { + toolVersion = "8.41" + configFile = File("../../checkstyle.xml") +} + +dependencies { + implementation(group = "org.teavm", name = "teavm-ide-deps", version = project.version.toString(), + classifier = "shaded") +} + +tasks { + withType { + sourceCompatibility = "11" + targetCompatibility = "11" + } + + patchPluginXml { + sinceBuild.set("201") + untilBuild.set("231.*") + } +} diff --git a/tools/idea/gradle/wrapper/gradle-wrapper.jar b/tools/idea/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..249e5832f090a2944b7473328c07c9755baa3196 GIT binary patch literal 60756 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 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/tools/idea/gradlew.bat b/tools/idea/gradlew.bat new file mode 100644 index 000000000..ac1b06f93 --- /dev/null +++ b/tools/idea/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/tools/idea/idea-artifacts/.gitignore b/tools/idea/idea-artifacts/.gitignore deleted file mode 100644 index 44b111e53..000000000 --- a/tools/idea/idea-artifacts/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/dependencies \ No newline at end of file diff --git a/tools/idea/idea-artifacts/dep-pom.xml b/tools/idea/idea-artifacts/dep-pom.xml deleted file mode 100644 index cf84bd711..000000000 --- a/tools/idea/idea-artifacts/dep-pom.xml +++ /dev/null @@ -1,387 +0,0 @@ - - - - - - 4.0.0 - org.teavm - teavm-idea-dependencies - 1.0.0-SNAPSHOT - - - - idea-releases - https://www.jetbrains.com/intellij-repository/releases - - - - - - com.jetbrains.intellij.idea - ideaIC - ${idea.version} - zip - provided - - - - org.teavm - teavm-tooling - ${teavm.version} - - - org.teavm - teavm-devserver - ${teavm.version} - - - org.teavm - teavm-classlib - ${teavm.version} - - - org.teavm - teavm-chrome-rdp - ${teavm.version} - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.0 - - - unpack-idea - compile - - unpack-dependencies - - - com.jetbrains.intellij.idea - ideaIC - ${basedir}/dependencies/idea - - - - - - - maven-antrun-plugin - 1.8 - - - process-resources - - - - - - - - - run - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.4.0 - - - package - - shade - - - - - com.jetbrains.intellij.idea:ideaIC:zip:* - joda-time:joda-time - - - false - dependencies/teavm.jar - - - com.google.gson - org.teavm.shade.gson - - - com.jcraft.jzlib - org.teavm.shade.jzlib - - - org.eclipse.jetty - org.teavm.shade.jetty - - - org.joda.time - org.teavm.shade.jodatime - - - org.objectweb.asm - org.teavm.shade.jetty.asm - - - org.slf4j - org.teavm.shade.slf4j - - - org.apache.commons - org.teavm.apachecommons - - - - - - - - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - teavm - - install-file - - install - - dependencies/teavm.jar - teavm - ${teavm.version} - - - - openapi - - install-file - - prepare-package - - dependencies/idea/lib/openapi.jar - openapi - - - - util - - install-file - - prepare-package - - dependencies/idea/lib/util.jar - util - - - - extensions - - install-file - - prepare-package - - dependencies/idea/lib/extensions.jar - extensions - - - - annotations - - install-file - - prepare-package - - dependencies/idea/lib/annotations.jar - annotations - - - - jdom - - install-file - - prepare-package - - dependencies/idea/lib/jdom.jar - jdom - - - - maven - - install-file - - prepare-package - - dependencies/idea/plugins/maven/lib/maven.jar - maven - - - - maven-server-api - - install-file - - prepare-package - - dependencies/idea/plugins/maven/lib/maven-server-api.jar - maven-server-api - - - - idea - - install-file - - prepare-package - - dependencies/idea/lib/idea.jar - idea - - - - jps-model - - install-file - - prepare-package - - dependencies/idea/lib/jps-model.jar - jps-model - - - - platform-api - - install-file - - prepare-package - - dependencies/idea/lib/platform-api.jar - platform-api - - - - platform-impl - - install-file - - prepare-package - - dependencies/idea/lib/platform-impl.jar - platform-impl - - - - java-api - - install-file - - prepare-package - - dependencies/idea/lib/java-api.jar - java-api - - - - java-impl - - install-file - - prepare-package - - dependencies/idea/lib/java-impl.jar - java-impl - - - - jps-builders - - install-file - - prepare-package - - dependencies/idea/lib/jps-builders.jar - jps-builders - - - - jps-builders-6 - - install-file - - prepare-package - - dependencies/idea/lib/jps-builders-6.jar - jps-builders-6 - - - - log4j - - install-file - - prepare-package - - dependencies/idea/lib/commons-logging-1.2.jar - commons-logging - - - - kotlin - - install-file - - prepare-package - - dependencies/idea/plugins/Kotlin/lib/kotlin-plugin.jar - kotlin-plugin - - - - scala - - install-file - - prepare-package - - dependencies/Scala/lib/scala-plugin.jar - scala-plugin - - - - - dependencies/maven - org.teavm.idea - ${idea.version} - jar - - - - - \ No newline at end of file diff --git a/tools/idea/idea-artifacts/pom.xml b/tools/idea/idea-artifacts/pom.xml deleted file mode 100644 index f65c98398..000000000 --- a/tools/idea/idea-artifacts/pom.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - org.teavm - teavm-idea-parent - 0.7.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - teavm-idea-artifacts - TeaVM IDEA artifacts - pom - - - - download-dependencies - - true - - - - - org.teavm - teavm-tooling - ${project.version} - - - org.teavm - teavm-devserver - ${project.version} - - - org.teavm - teavm-classlib - ${project.version} - - - org.teavm - teavm-chrome-rdp - ${project.version} - - - - - - - org.codehaus.mojo - exec-maven-plugin - - - copy-dependencies - initialize - - exec - - - mvn - - -f - dep-pom.xml - install - -Didea.version=${idea.version} - -Dteavm.version=${project.version} - -Dmaven.repo.local=${settings.localRepository} - -B - -e - - - - - - - - - - \ No newline at end of file diff --git a/tools/idea/idea-artifacts/teavm-idea-artifacts.iml b/tools/idea/idea-artifacts/teavm-idea-artifacts.iml deleted file mode 100644 index 4fd5057cb..000000000 --- a/tools/idea/idea-artifacts/teavm-idea-artifacts.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/tools/idea/jps-common/.gitignore b/tools/idea/jps-common/.gitignore deleted file mode 100644 index f1ff06d60..000000000 --- a/tools/idea/jps-common/.gitignore +++ /dev/null @@ -1 +0,0 @@ -lib/ \ No newline at end of file diff --git a/tools/idea/jps-common/pom.xml b/tools/idea/jps-common/pom.xml deleted file mode 100644 index d16729ce7..000000000 --- a/tools/idea/jps-common/pom.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - teavm-idea-parent - org.teavm - 0.7.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - teavm-jps-common - TeaVM IDEA JPS common artifact - - - ${basedir}/.. - - - - - org.teavm - teavm-idea-artifacts - ${project.version} - pom - - - org.teavm.idea - openapi - ${idea.version} - provided - - - org.teavm.idea - annotations - ${idea.version} - provided - - - org.teavm.idea - jdom - ${idea.version} - provided - - - org.teavm.idea - util - ${idea.version} - provided - - - org.teavm.idea - jps-model - ${idea.version} - provided - - - org.teavm.idea - platform-api - ${idea.version} - provided - - - org.teavm.idea - jps-builders - ${idea.version} - provided - - - org.teavm.idea - jps-builders-6 - ${idea.version} - provided - - - - org.teavm.idea - teavm - ${project.version} - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - ../../checkstyle.xml - config_loc=${basedir}/../../../ - - - - - - \ No newline at end of file diff --git a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java deleted file mode 100644 index ba71bb0ea..000000000 --- a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMJpsConfiguration.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.jps.model; - -import com.intellij.util.xmlb.annotations.AbstractCollection; -import com.intellij.util.xmlb.annotations.Tag; -import com.intellij.util.xmlb.annotations.Transient; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.model.JpsElementChildRole; -import org.jetbrains.jps.model.ex.JpsElementBase; -import org.jetbrains.jps.model.ex.JpsElementChildRoleBase; -import org.jetbrains.jps.model.module.JpsModule; -import org.teavm.tooling.TeaVMTargetType; - -public class TeaVMJpsConfiguration extends JpsElementBase { - static final JpsElementChildRole JS_ROLE = JpsElementChildRoleBase.create( - "TeaVM configuration (JS)"); - - static final JpsElementChildRole WEBASSEMBLY_ROLE = JpsElementChildRoleBase.create( - "TeaVM configuration (WebAssembly)"); - - @Transient - private TeaVMTargetType targetType; - - private boolean skipped; - private String mainClass; - private String targetDirectory; - private boolean sourceMapsFileGenerated = true; - private boolean sourceFilesCopied = true; - private List properties = new ArrayList<>(); - - public boolean isSkipped() { - return skipped; - } - - public void setSkipped(boolean skipped) { - this.skipped = skipped; - } - - public TeaVMTargetType getTargetType() { - return targetType; - } - - public void setTargetType(TeaVMTargetType targetType) { - this.targetType = targetType; - } - - public String getMainClass() { - return mainClass; - } - - public void setMainClass(String mainClass) { - this.mainClass = mainClass; - } - - public String getTargetDirectory() { - return targetDirectory; - } - - public void setTargetDirectory(String targetDirectory) { - this.targetDirectory = targetDirectory; - } - - public boolean isSourceMapsFileGenerated() { - return sourceMapsFileGenerated; - } - - public void setSourceMapsFileGenerated(boolean sourceMapsFileGenerated) { - this.sourceMapsFileGenerated = sourceMapsFileGenerated; - } - - public boolean isSourceFilesCopied() { - return sourceFilesCopied; - } - - public void setSourceFilesCopied(boolean sourceFilesCopied) { - this.sourceFilesCopied = sourceFilesCopied; - } - - @Tag("properties") - @AbstractCollection(surroundWithTag = false) - public List getProperties() { - return properties; - } - - public void setProperties(List properties) { - this.properties = properties; - } - - public static List getAll(JpsModule module) { - List configurations = new ArrayList<>(); - for (JpsElementChildRole role : Arrays.asList(JS_ROLE, WEBASSEMBLY_ROLE)) { - TeaVMJpsConfiguration configuration = module.getContainer().getChild(role); - if (configuration != null) { - configurations.add(configuration); - } - } - return configurations; - } - - @NotNull - @Override - public TeaVMJpsConfiguration createCopy() { - TeaVMJpsConfiguration copy = new TeaVMJpsConfiguration(); - copy.applyChanges(this); - return copy; - } - - @Override - public void applyChanges(@NotNull TeaVMJpsConfiguration modified) { - mainClass = modified.mainClass; - targetDirectory = modified.targetDirectory; - sourceMapsFileGenerated = modified.sourceMapsFileGenerated; - sourceFilesCopied = modified.sourceFilesCopied; - - properties.clear(); - properties.addAll(modified.properties.stream() - .map(property -> property.createCopy()) - .collect(Collectors.toList())); - } -} diff --git a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMJpsWorkspaceConfiguration.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMJpsWorkspaceConfiguration.java deleted file mode 100644 index 515b0017b..000000000 --- a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMJpsWorkspaceConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2017 Alexey Andreev. - * - * 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.teavm.idea.jps.model; - -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.model.ex.JpsElementBase; - -public class TeaVMJpsWorkspaceConfiguration extends JpsElementBase { - private boolean daemonEnabled; - private int daemonMemory = 1024; - private boolean incremental; - - public boolean isDaemonEnabled() { - return daemonEnabled; - } - - public void setDaemonEnabled(boolean daemonEnabled) { - this.daemonEnabled = daemonEnabled; - } - - public boolean isIncremental() { - return incremental; - } - - public void setIncremental(boolean incremental) { - this.incremental = incremental; - } - - public int getDaemonMemory() { - return daemonMemory; - } - - public void setDaemonMemory(int daemonMemory) { - this.daemonMemory = daemonMemory; - } - - @NotNull - @Override - public TeaVMJpsWorkspaceConfiguration createCopy() { - TeaVMJpsWorkspaceConfiguration copy = new TeaVMJpsWorkspaceConfiguration(); - copy.applyChanges(this); - return copy; - } - - @Override - public void applyChanges(@NotNull TeaVMJpsWorkspaceConfiguration configuration) { - daemonEnabled = configuration.daemonEnabled; - incremental = configuration.incremental; - daemonMemory = configuration.daemonMemory; - } -} diff --git a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java deleted file mode 100644 index bf6331137..000000000 --- a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMModelSerializerService.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.jps.model; - -import com.intellij.util.xmlb.XmlSerializer; -import java.util.Arrays; -import java.util.List; -import org.jdom.Element; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.model.JpsElement; -import org.jetbrains.jps.model.JpsElementChildRole; -import org.jetbrains.jps.model.module.JpsModule; -import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension; -import org.jetbrains.jps.model.serialization.facet.JpsFacetConfigurationSerializer; -import org.teavm.tooling.TeaVMTargetType; - -public class TeaVMModelSerializerService extends JpsModelSerializerExtension { - @NotNull - @Override - public List> getFacetConfigurationSerializers() { - return Arrays.asList(jsSerializer, wasmSerializer); - } - - private TeaVMFacetSerializer jsSerializer = new TeaVMFacetSerializer(TeaVMJpsConfiguration.JS_ROLE, - "teavm-js", "TeaVM (JS)", TeaVMTargetType.JAVASCRIPT); - - private TeaVMFacetSerializer wasmSerializer = new TeaVMFacetSerializer(TeaVMJpsConfiguration.WEBASSEMBLY_ROLE, - "teavm-wasm", "TeaVM (WebAssembly)", TeaVMTargetType.WEBASSEMBLY); - - private class TeaVMFacetSerializer - extends JpsFacetConfigurationSerializer { - private TeaVMTargetType targetType; - - public TeaVMFacetSerializer(JpsElementChildRole role, String facetTypeId, - @Nullable String facetName, TeaVMTargetType targetType) { - super(role, facetTypeId, facetName); - this.targetType = targetType; - } - - @Override - protected TeaVMJpsConfiguration loadExtension(@NotNull Element element, String s, JpsElement jpsElement, - JpsModule jpsModule) { - TeaVMJpsConfiguration configuration = XmlSerializer.deserialize(element, TeaVMJpsConfiguration.class); - configuration.setTargetType(targetType); - return configuration; - } - - @Override - protected void saveExtension(TeaVMJpsConfiguration configuration, Element element, JpsModule jpsModule) { - } - } -} diff --git a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMProperty.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMProperty.java deleted file mode 100644 index 61f981a02..000000000 --- a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/model/TeaVMProperty.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2017 Alexey Andreev. - * - * 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.teavm.idea.jps.model; - -import com.intellij.util.xmlb.annotations.Attribute; -import com.intellij.util.xmlb.annotations.Tag; - -@Tag("property") -public class TeaVMProperty { - private String key = ""; - private String value = ""; - - @Attribute("key") - public String getKey() { - return key; - } - - public void setKey(String key) { - this.key = key; - } - - @Attribute("value") - public String getValue() { - return value; - } - - public void setValue(String value) { - this.value = value; - } - - public TeaVMProperty createCopy() { - TeaVMProperty copy = new TeaVMProperty(); - copy.key = key; - copy.value = value; - return copy; - } -} diff --git a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMBuilderAssistant.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMBuilderAssistant.java deleted file mode 100644 index ceff8f2da..000000000 --- a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMBuilderAssistant.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.jps.remote; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -public interface TeaVMBuilderAssistant extends Remote { - String REMOTE_PORT = "teavm.jps.remote-port"; - String ID = "TeaVM-JPS-Assistant"; - - TeaVMElementLocation getMethodLocation(String className, String methodName, String methodDesc) - throws RemoteException; -} diff --git a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMElementLocation.java b/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMElementLocation.java deleted file mode 100644 index 2ef745a53..000000000 --- a/tools/idea/jps-common/src/main/java/org/teavm/idea/jps/remote/TeaVMElementLocation.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.jps.remote; - -import java.io.Serializable; - -public class TeaVMElementLocation implements Serializable { - private int startOffset; - private int endOffset; - private int line; - private int column; - private String path; - - public TeaVMElementLocation(int startOffset, int endOffset, int line, int column, String path) { - this.startOffset = startOffset; - this.endOffset = endOffset; - this.line = line; - this.column = column; - this.path = path; - } - - public int getStartOffset() { - return startOffset; - } - - public int getEndOffset() { - return endOffset; - } - - public int getLine() { - return line; - } - - public int getColumn() { - return column; - } - - public String getPath() { - return path; - } -} diff --git a/tools/idea/jps-common/teavm-jps-common.iml b/tools/idea/jps-common/teavm-jps-common.iml deleted file mode 100644 index bc40e44c8..000000000 --- a/tools/idea/jps-common/teavm-jps-common.iml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tools/idea/jps-plugin/pom.xml b/tools/idea/jps-plugin/pom.xml deleted file mode 100644 index a5be574e1..000000000 --- a/tools/idea/jps-plugin/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - - - - - teavm-idea-parent - org.teavm - 0.7.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - teavm-jps-plugin - TeaVM IDEA JPS plugin - - - ${basedir}/.. - - - - - org.teavm.idea - openapi - ${idea.version} - provided - - - org.teavm.idea - annotations - ${idea.version} - provided - - - org.teavm.idea - util - ${idea.version} - provided - - - org.teavm.idea - jdom - ${idea.version} - provided - - - org.teavm.idea - jps-model - ${idea.version} - provided - - - org.teavm.idea - platform-api - ${idea.version} - provided - - - org.teavm.idea - jps-builders - ${idea.version} - provided - - - org.teavm.idea - jps-builders-6 - ${idea.version} - provided - - - - org.teavm - teavm-jps-common - ${project.version} - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - ../../checkstyle.xml - config_loc=${basedir}/../../../ - - - - - - \ No newline at end of file diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/RenamingClassLoader.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/RenamingClassLoader.java deleted file mode 100644 index c64162c53..000000000 --- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/RenamingClassLoader.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Copyright 2018 Alexey Andreev. - * - * 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.teavm.idea.jps; - -import java.io.BufferedInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.net.URL; -import java.net.URLClassLoader; -import java.util.ArrayList; -import java.util.List; -import org.teavm.asm.ClassReader; -import org.teavm.asm.ClassWriter; - -public class RenamingClassLoader extends URLClassLoader { - private List renameList = new ArrayList<>(); - - public RenamingClassLoader(URL[] urls, ClassLoader parent) { - super(urls, parent); - } - - public void rename(String prefix, String to) { - renameList.add(new Rename(prefix, to)); - } - - @Override - protected Class findClass(String name) throws ClassNotFoundException { - try { - return getParent().loadClass(name); - } catch (ClassNotFoundException e) { - // continue - } - - try (InputStream input = getResourceAsStream(name.replace('.', '/') + ".class")) { - ClassReader classReader = new ClassReader(new BufferedInputStream(input)); - ClassWriter writer = new ClassWriter(0); - RenamingVisitor visitor = new RenamingVisitor(writer); - for (Rename rename : renameList) { - visitor.rename(rename.prefix, rename.to); - } - classReader.accept(visitor, 0); - byte[] data = writer.toByteArray(); - return defineClass(name, data, 0, data.length); - } catch (IOException e) { - throw new ClassNotFoundException(name, e); - } - } - - static class Rename { - final String prefix; - final String to; - - Rename(String prefix, String to) { - this.prefix = prefix; - this.to = to; - } - } -} diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/RenamingVisitor.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/RenamingVisitor.java deleted file mode 100644 index 5b279f8c3..000000000 --- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/RenamingVisitor.java +++ /dev/null @@ -1,287 +0,0 @@ -/* - * Copyright 2018 Alexey Andreev. - * - * 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.teavm.idea.jps; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; -import org.teavm.asm.AnnotationVisitor; -import org.teavm.asm.ClassVisitor; -import org.teavm.asm.FieldVisitor; -import org.teavm.asm.Handle; -import org.teavm.asm.Label; -import org.teavm.asm.MethodVisitor; -import org.teavm.asm.Opcodes; -import org.teavm.asm.Type; -import org.teavm.asm.TypePath; - -public class RenamingVisitor extends ClassVisitor { - private List renameList = new ArrayList<>(); - - public RenamingVisitor(ClassVisitor inner) { - super(Opcodes.ASM5, inner); - } - - public void rename(String prefix, String newName) { - renameList.add(new Rename(prefix, newName)); - } - - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { - for (int i = 0; i < interfaces.length; ++i) { - interfaces[i] = renameClass(interfaces[i]); - } - super.visit(version, access, name, signature, renameClass(superName), interfaces); - } - - @Override - public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - desc = renameValueDesc(desc); - return new RenamingAnnotationVisitor(super.visitAnnotation(desc, visible)); - } - - @Override - public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) { - desc = renameValueDesc(desc); - return new RenamingAnnotationVisitor(super.visitTypeAnnotation(typeRef, typePath, desc, visible)); - } - - @Override - public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - desc = renameMethodDesc(desc); - return new RenamingMethodVisitor(super.visitMethod(access, name, desc, signature, exceptions)); - } - - @Override - public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { - return new RenamingFieldVisitor(super.visitField(access, name, renameValueDesc(desc), signature, value)); - } - - class RenamingMethodVisitor extends MethodVisitor { - RenamingMethodVisitor(MethodVisitor inner) { - super(Opcodes.ASM5, inner); - } - - @Override - public AnnotationVisitor visitLocalVariableAnnotation(int typeRef, TypePath typePath, Label[] start, - Label[] end, int[] index, String desc, boolean visible) { - desc = renameValueDesc(desc); - return new RenamingAnnotationVisitor(super.visitLocalVariableAnnotation(typeRef, typePath, - start, end, index, desc, visible)); - } - - @Override - public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - return new RenamingAnnotationVisitor(super.visitAnnotation(desc, visible)); - } - - @Override - public AnnotationVisitor visitAnnotationDefault() { - return new RenamingAnnotationVisitor(super.visitAnnotationDefault()); - } - - @Override - public AnnotationVisitor visitInsnAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) { - desc = renameValueDesc(desc); - return new RenamingAnnotationVisitor(super.visitInsnAnnotation(typeRef, typePath, desc, visible)); - } - - @Override - public AnnotationVisitor visitParameterAnnotation(int parameter, String desc, boolean visible) { - desc = renameValueDesc(desc); - return new RenamingAnnotationVisitor(super.visitParameterAnnotation(parameter, desc, visible)); - } - - @Override - public AnnotationVisitor visitTryCatchAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) { - desc = renameValueDesc(desc); - return new RenamingAnnotationVisitor(super.visitTryCatchAnnotation(typeRef, typePath, desc, visible)); - } - - @Override - public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) { - desc = renameValueDesc(desc); - return new RenamingAnnotationVisitor(super.visitTypeAnnotation(typeRef, typePath, desc, visible)); - } - - @Override - public void visitFieldInsn(int opcode, String owner, String name, String desc) { - owner = renameClass(owner); - desc = renameValueDesc(desc); - super.visitFieldInsn(opcode, owner, name, desc); - } - - @Override - public void visitLdcInsn(Object cst) { - if (cst instanceof Type) { - cst = Type.getType(renameType((Type) cst)); - } - super.visitLdcInsn(cst); - } - - @Override - public void visitLocalVariable(String name, String desc, String signature, Label start, Label end, int index) { - desc = renameValueDesc(desc); - super.visitLocalVariable(name, desc, signature, start, end, index); - } - - @Override - public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) { - owner = renameClass(owner); - desc = renameMethodDesc(desc); - super.visitMethodInsn(opcode, owner, name, desc, itf); - } - - @Override - public void visitTypeInsn(int opcode, String type) { - if (type.startsWith("[")) { - type = renameValueDesc(type); - } else { - type = renameClass(type); - } - super.visitTypeInsn(opcode, type); - } - - @Override - public void visitTryCatchBlock(Label start, Label end, Label handler, String type) { - type = renameClass(type); - super.visitTryCatchBlock(start, end, handler, type); - } - - @Override - public void visitFrame(int type, int nLocal, Object[] local, int nStack, Object[] stack) { - for (int i = 0; i < local.length; ++i) { - if (local[i] instanceof String) { - local[i] = renameClass((String) local[i]); - } - } - for (int i = 0; i < stack.length; ++i) { - if (stack[i] instanceof String) { - stack[i] = renameClass((String) stack[i]); - } - } - super.visitFrame(type, nLocal, local, nStack, stack); - } - - @Override - public void visitInvokeDynamicInsn(String name, String desc, Handle bsm, Object... bsmArgs) { - desc = renameMethodDesc(desc); - bsm = renameHandle(bsm); - for (int i = 0; i < bsmArgs.length; ++i) { - Object arg = bsmArgs[i]; - if (arg instanceof Type) { - arg = Type.getType(renameType((Type) arg)); - } else if (arg instanceof Handle) { - arg = renameHandle((Handle) arg); - } - bsmArgs[i] = arg; - } - super.visitInvokeDynamicInsn(name, desc, bsm, bsmArgs); - } - } - - class RenamingFieldVisitor extends FieldVisitor { - RenamingFieldVisitor(FieldVisitor inner) { - super(Opcodes.ASM5, inner); - } - - @Override - public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - desc = renameValueDesc(desc); - return new RenamingAnnotationVisitor(super.visitAnnotation(desc, visible)); - } - - @Override - public AnnotationVisitor visitTypeAnnotation(int typeRef, TypePath typePath, String desc, boolean visible) { - desc = renameValueDesc(desc); - return new RenamingAnnotationVisitor(super.visitTypeAnnotation(typeRef, typePath, desc, visible)); - } - } - - class RenamingAnnotationVisitor extends AnnotationVisitor { - RenamingAnnotationVisitor(AnnotationVisitor inner) { - super(Opcodes.ASM5, inner); - } - - @Override - public AnnotationVisitor visitArray(String name) { - return new RenamingAnnotationVisitor(super.visitArray(name)); - } - - @Override - public AnnotationVisitor visitAnnotation(String name, String desc) { - desc = renameValueDesc(desc); - return new RenamingAnnotationVisitor(super.visitAnnotation(name, desc)); - } - - @Override - public void visitEnum(String name, String desc, String value) { - desc = renameValueDesc(desc); - super.visitEnum(name, desc, value); - } - } - - private String renameClass(String className) { - if (className == null) { - return null; - } - for (Rename rename : renameList) { - if (className.startsWith(rename.prefix)) { - return rename.renameTo + className.substring(rename.prefix.length()); - } - } - return className; - } - - private Handle renameHandle(Handle handle) { - String desc = handle.getDesc(); - desc = desc.startsWith("(") ? renameMethodDesc(desc) : renameValueDesc(desc); - return new Handle(handle.getTag(), renameClass(handle.getOwner()), handle.getName(), desc); - } - - private String renameValueDesc(String desc) { - return renameType(Type.getType(desc)); - } - - private String renameMethodDesc(String desc) { - return renameType(Type.getMethodType(desc)); - } - - private String renameType(Type type) { - switch (type.getSort()) { - case Type.ARRAY: - return "[" + renameValueDesc(type.getDescriptor().substring(1)); - case Type.METHOD: - return "(" + Arrays.stream(type.getArgumentTypes()).map(this::renameType) - .collect(Collectors.joining("")) + ")" + renameType(type.getReturnType()); - case Type.OBJECT: - return "L" + renameClass(type.getInternalName()) + ";"; - default: - return type.getDescriptor(); - } - } - - static class Rename { - final String prefix; - final String renameTo; - - Rename(String prefix, String renameTo) { - this.prefix = prefix; - this.renameTo = renameTo; - } - } -} diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java deleted file mode 100644 index 3222886f2..000000000 --- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuild.java +++ /dev/null @@ -1,546 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.jps; - -import static java.util.stream.Collectors.toList; -import static java.util.stream.Collectors.toSet; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; -import java.nio.charset.StandardCharsets; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Properties; -import java.util.Queue; -import java.util.Set; -import java.util.stream.Stream; -import org.jetbrains.jps.builders.BuildOutputConsumer; -import org.jetbrains.jps.incremental.CompileContext; -import org.jetbrains.jps.incremental.messages.BuildMessage; -import org.jetbrains.jps.incremental.messages.CompilerMessage; -import org.jetbrains.jps.incremental.messages.ProgressMessage; -import org.jetbrains.jps.model.JpsProject; -import org.jetbrains.jps.model.java.JpsJavaExtensionService; -import org.jetbrains.jps.model.library.JpsLibrary; -import org.jetbrains.jps.model.library.JpsLibraryRoot; -import org.jetbrains.jps.model.library.JpsOrderRootType; -import org.jetbrains.jps.model.module.JpsDependencyElement; -import org.jetbrains.jps.model.module.JpsLibraryDependency; -import org.jetbrains.jps.model.module.JpsModule; -import org.jetbrains.jps.model.module.JpsModuleDependency; -import org.jetbrains.jps.model.module.JpsModuleSourceRoot; -import org.teavm.callgraph.CallGraph; -import org.teavm.callgraph.CallGraphNode; -import org.teavm.callgraph.CallSite; -import org.teavm.common.IntegerArray; -import org.teavm.diagnostics.DefaultProblemTextConsumer; -import org.teavm.diagnostics.Problem; -import org.teavm.diagnostics.ProblemProvider; -import org.teavm.idea.jps.model.TeaVMJpsConfiguration; -import org.teavm.idea.jps.model.TeaVMProperty; -import org.teavm.idea.jps.remote.TeaVMBuilderAssistant; -import org.teavm.idea.jps.remote.TeaVMElementLocation; -import org.teavm.model.CallLocation; -import org.teavm.model.MethodReference; -import org.teavm.model.TextLocation; -import org.teavm.model.ValueType; -import org.teavm.tooling.builder.BuildException; -import org.teavm.tooling.builder.BuildResult; -import org.teavm.tooling.builder.BuildStrategy; -import org.teavm.vm.TeaVMPhase; -import org.teavm.vm.TeaVMProgressFeedback; -import org.teavm.vm.TeaVMProgressListener; - -class TeaVMBuild { - private static final String[] BLACKLISTED_CLASSES = { - "org/teavm/jso/impl/JSOPlugin.class", - "org/teavm/metaprogramming/impl/MetaprogrammingImpl.class", - "org/teavm/classlib/impl/JCLPlugin.class" - }; - - private final CompileContext context; - private final List classPathEntries = new ArrayList<>(); - private List directoryClassPathEntries; - private TeaVMStorage storage; - private final TeaVMBuilderAssistant assistant; - private final Map sourceFileCache = new HashMap<>(); - private final Map fileLineCache = new HashMap<>(); - private BuildStrategy buildStrategy; - private BuildOutputConsumer outputConsumer; - private boolean incrementaSupported; - - TeaVMBuild(CompileContext context, TeaVMBuilderAssistant assistant, BuildStrategy buildStrategy, - BuildOutputConsumer outputConsumer, boolean incrementalSupported) { - this.context = context; - this.assistant = assistant; - this.buildStrategy = buildStrategy; - this.outputConsumer = outputConsumer; - this.incrementaSupported = incrementalSupported; - } - - boolean perform(JpsModule module, TeaVMBuildTarget target) throws IOException, BuildException { - TeaVMStorageProvider storageProvider = new TeaVMStorageProvider( - target.getConfiguration().getTargetType().name()); - storage = context.getProjectDescriptor().dataManager.getStorage(target, storageProvider); - - TeaVMJpsConfiguration config = target.getConfiguration(); - if (config.isSkipped()) { - context.processMessage(new CompilerMessage("TeaVM", BuildMessage.Kind.INFO, - "TeaVM skipped due to facet configuration")); - return false; - } - - classPathEntries.clear(); - buildStrategy.init(); - buildClassPath(module); - directoryClassPathEntries = classPathEntries.stream().filter(name -> new File(name).isDirectory()) - .collect(toList()); - - if (!hasChanges(target)) { - return false; - } - - buildStrategy.setClassPathEntries(classPathEntries); - buildStrategy.setDebugInformationGenerated(config.isSourceMapsFileGenerated()); - buildStrategy.setSourceMapsFileGenerated(config.isSourceMapsFileGenerated()); - buildStrategy.setSourceFilesCopied(config.isSourceFilesCopied()); - buildStrategy.setMainClass(config.getMainClass()); - buildStrategy.setTargetType(config.getTargetType()); - buildStrategy.setTargetDirectory(config.getTargetDirectory()); - buildStrategy.setProgressListener(createProgressListener(context)); - buildStrategy.setIncremental(incrementaSupported && !isRebuild(target)); - - Properties properties = new Properties(); - for (TeaVMProperty property : config.getProperties()) { - properties.put(property.getKey(), property.getValue()); - } - buildStrategy.setProperties(properties); - - BuildResult buildResult = buildStrategy.build(); - - if (!buildResult.getProblems().getSevereProblems().isEmpty()) { - updateStorage(buildResult); - } - - reportProblems(buildResult.getProblems(), buildResult.getCallGraph()); - - for (String fileName : buildResult.getGeneratedFiles()) { - outputConsumer.registerOutputFile(new File(fileName), Collections.emptyList()); - } - - return true; - } - - private TeaVMProgressListener createProgressListener(CompileContext context) { - return new TeaVMProgressListener() { - private TeaVMPhase currentPhase; - int expectedCount; - - @Override - public TeaVMProgressFeedback phaseStarted(TeaVMPhase phase, int count) { - expectedCount = count; - context.processMessage(new ProgressMessage(phaseName(phase), 0)); - currentPhase = phase; - return context.getCancelStatus().isCanceled() ? TeaVMProgressFeedback.CANCEL - : TeaVMProgressFeedback.CONTINUE; - } - - @Override - public TeaVMProgressFeedback progressReached(int progress) { - context.processMessage(new ProgressMessage(phaseName(currentPhase), (float) progress / expectedCount)); - return context.getCancelStatus().isCanceled() ? TeaVMProgressFeedback.CANCEL - : TeaVMProgressFeedback.CONTINUE; - } - }; - } - - private static String phaseName(TeaVMPhase phase) { - switch (phase) { - case DEPENDENCY_ANALYSIS: - return "Discovering classes to compile"; - case COMPILING: - return "Compiling"; - default: - throw new AssertionError(); - } - } - - private void reportProblems(ProblemProvider problemProvider, CallGraph callGraph) { - for (Problem problem : problemProvider.getProblems()) { - BuildMessage.Kind kind; - switch (problem.getSeverity()) { - case ERROR: - kind = BuildMessage.Kind.ERROR; - break; - case WARNING: - kind = BuildMessage.Kind.WARNING; - break; - default: - continue; - } - - DefaultProblemTextConsumer textConsumer = new DefaultProblemTextConsumer(); - problem.render(textConsumer); - String baseText = textConsumer.getText(); - - List problemsToReport = resolveProblemLocation(problem, callGraph); - - if (problemsToReport.isEmpty()) { - context.processMessage(new CompilerMessage("TeaVM", kind, problem.getText(), null, - -1, -1, -1, -1, -1)); - } - for (ProblemToReport problemToReport : problemsToReport) { - String text = baseText + buildCallStack(problemToReport.locations); - context.processMessage(new CompilerMessage("TeaVM", kind, text, problemToReport.path, - problemToReport.startOffset, problemToReport.endOffset, problemToReport.startOffset, - problemToReport.line, 0)); - } - } - } - - static class ProblemToReport { - int line; - int startOffset; - int endOffset; - String path; - CallLocationList locations; - } - - static class CallLocationList { - final CallLocation value; - final CallLocationList next; - - private CallLocationList(CallLocation value, CallLocationList next) { - this.value = value; - this.next = next; - } - } - - private List resolveProblemLocation(Problem problem, CallGraph callGraph) { - class Step { - private final CallLocationList locationList; - private final CallLocation location; - - private Step(CallLocationList locationList, CallLocation location) { - this.locationList = locationList; - this.location = location; - } - } - - List problemsToReport = new ArrayList<>(); - Set visited = new HashSet<>(); - Queue workList = new ArrayDeque<>(); - workList.add(new Step(null, problem.getLocation())); - - while (!workList.isEmpty()) { - Step step = workList.remove(); - if (step.location == null || !visited.add(step.location.getMethod())) { - continue; - } - ProblemToReport result = getProblemLocation(step.location); - - CallGraphNode node = callGraph.getNode(step.location.getMethod()); - if (node.getCallerCallSites().isEmpty() || isValid(result)) { - result.locations = step.locationList; - problemsToReport.add(result); - } else { - for (CallSite callSite : node.getCallerCallSites()) { - for (CallGraphNode caller : callSite.getCallers()) { - CallLocation nextLocation = new CallLocation(caller.getMethod(), - getLocation(callSite.getLocations(caller))); - workList.add(new Step(new CallLocationList(step.location, step.locationList), nextLocation)); - } - } - } - } - - return problemsToReport; - } - - private TextLocation getLocation(Collection location) { - return location.isEmpty() ? null : location.iterator().next(); - } - - private boolean isValid(ProblemToReport problemToReport) { - return problemToReport.path != null && (problemToReport.line >= 0 || problemToReport.startOffset >= 0); - } - - private ProblemToReport getProblemLocation(CallLocation callLocation) { - String path = null; - File file = null; - int line = -1; - int startOffset = -1; - int endOffset = -1; - - if (callLocation != null) { - TextLocation insnLocation = callLocation.getSourceLocation(); - if (insnLocation != null) { - path = insnLocation.getFileName(); - line = insnLocation.getLine(); - } - - if (line <= 0 && assistant != null && callLocation.getMethod() != null) { - MethodReference method = callLocation.getMethod(); - try { - TeaVMElementLocation location = assistant.getMethodLocation(method.getClassName(), - method.getName(), ValueType.methodTypeToString(method.getSignature())); - line = location.getLine(); - startOffset = location.getStartOffset(); - endOffset = location.getEndOffset(); - file = new File(location.getPath()); - - if (line <= 0) { - int[] lines = getLineOffsets(file); - if (lines != null) { - line = Arrays.binarySearch(lines, startOffset + 1); - if (line < 0) { - line = -line - 1; - } - } - } - } catch (Exception e) { - // just don't fill location fields - } - } - - if (file == null) { - if (path != null) { - file = lookupSource(path); - path = file != null ? file.getPath() : null; - } - } else { - path = file.getPath(); - } - - if (startOffset < 0 && file != null && line > 0) { - int[] lines = getLineOffsets(file); - if (lines != null && line < lines.length) { - startOffset = lines[line - 1]; - endOffset = lines[line] - 1; - } - } - } - - ProblemToReport result = new ProblemToReport(); - result.line = line; - result.startOffset = startOffset; - result.endOffset = endOffset; - result.path = path; - return result; - } - - private String buildCallStack(CallLocationList callLocationList) { - List locations = new ArrayList<>(); - while (callLocationList != null) { - locations.add(callLocationList.value); - callLocationList = callLocationList.next; - } - Collections.reverse(locations); - - StringBuilder sb = new StringBuilder(); - for (CallLocation location : locations) { - sb.append("\n at ").append(location.getMethod()); - if (location.getSourceLocation() != null) { - sb.append("(").append(location.getSourceLocation()).append(")"); - } - } - return sb.toString(); - } - - private File lookupSource(String relativePath) { - return sourceFileCache.computeIfAbsent(relativePath, this::lookupSourceCacheMiss); - } - - private File lookupSourceCacheMiss(String relativePath) { - JpsProject project = context.getProjectDescriptor().getModel().getProject(); - for (JpsModule module : project.getModules()) { - for (JpsModuleSourceRoot sourceRoot : module.getSourceRoots()) { - File fullPath = new File(sourceRoot.getFile(), relativePath); - if (fullPath.exists()) { - return fullPath; - } - } - } - return null; - } - - private int[] getLineOffsets(File file) { - return fileLineCache.computeIfAbsent(file, this::getLineOffsetsCacheMiss); - } - - private int[] getLineOffsetsCacheMiss(File file) { - IntegerArray lines = new IntegerArray(50); - try (Reader reader = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8)) { - int offset = 0; - lines.add(0); - - boolean expectingLf = false; - while (true) { - int c = reader.read(); - if (c == -1) { - break; - } - if (c == '\n') { - expectingLf = false; - lines.add(offset + 1); - } else { - if (expectingLf) { - expectingLf = false; - lines.add(offset); - } - if (c == '\r') { - lines.add(offset + 1); - expectingLf = true; - } - } - ++offset; - } - - if (expectingLf) { - lines.add(offset); - } - lines.add(offset + 1); - } catch (IOException e) { - return null; - } - return lines.getAll(); - } - - private boolean isRebuild(TeaVMBuildTarget target) { - return !context.getScope().isBuildIncrementally(target.getTargetType()) - || context.getScope().isBuildForced(target); - } - - private boolean hasChanges(TeaVMBuildTarget target) { - if (isRebuild(target)) { - return true; - } - - List filesToWatch = storage.getParticipatingFiles(); - if (filesToWatch == null) { - return true; - } - - for (TeaVMStorage.Entry fileToWatch : filesToWatch) { - Long actualTimestamp = getTimestamp(fileToWatch.path); - if (actualTimestamp == null || actualTimestamp > fileToWatch.timestamp) { - return true; - } - } - return false; - } - - private void updateStorage(BuildResult buildResult) { - Set resources = Stream.concat(buildResult.getClasses().stream() - .map(cls -> cls.replace('.', '/') + ".class"), buildResult.getUsedResources().stream()) - .collect(toSet()); - List participatingFiles = resources.stream() - .map(path -> { - Long timestamp = getTimestamp(path); - return timestamp != null ? new TeaVMStorage.Entry(path, timestamp) : null; - }) - .filter(Objects::nonNull) - .collect(toList()); - - storage.setParticipatingFiles(participatingFiles); - } - - private Long getTimestamp(String path) { - for (String classPathEntry : directoryClassPathEntries) { - File file = new File(classPathEntry, path); - if (file.exists()) { - return file.lastModified(); - } - } - return null; - } - - private void buildClassPath(JpsModule module) { - File output = JpsJavaExtensionService.getInstance().getOutputDirectory(module, false); - if (output != null) { - classPathEntries.add(output.getPath()); - } - - for (JpsModuleSourceRoot sourceRoot : module.getSourceRoots()) { - buildStrategy.addSourcesDirectory(sourceRoot.getFile().getAbsolutePath()); - } - - for (JpsDependencyElement dependency : module.getDependenciesList().getDependencies()) { - if (dependency instanceof JpsModuleDependency) { - JpsModuleDependency moduleDependency = (JpsModuleDependency) dependency; - File dependencyOutput = JpsJavaExtensionService.getInstance().getOutputDirectory( - moduleDependency.getModule(), false); - if (dependencyOutput != null && !isBlacklistedDependency(dependencyOutput)) { - classPathEntries.add(dependencyOutput.getPath()); - } - for (JpsModuleSourceRoot sourceRoot : moduleDependency.getModule().getSourceRoots()) { - buildStrategy.addSourcesDirectory(sourceRoot.getFile().getAbsolutePath()); - } - } else if (dependency instanceof JpsLibraryDependency) { - JpsLibrary library = ((JpsLibraryDependency) dependency).getLibrary(); - if (library == null) { - continue; - } - classPathEntries.addAll(library.getFiles(JpsOrderRootType.COMPILED).stream().map(File::getPath) - .collect(toList())); - - for (JpsLibraryRoot libraryRoot : library.getRoots(JpsOrderRootType.SOURCES)) { - File file = getFileFromUrl(libraryRoot.getUrl()); - if (file != null) { - if (file.isDirectory()) { - buildStrategy.addSourcesDirectory(file.getAbsolutePath()); - } else { - buildStrategy.addSourcesJar(file.getAbsolutePath()); - } - } - } - } - } - } - - private static boolean isBlacklistedDependency(File dependency) { - for (String entry : BLACKLISTED_CLASSES) { - if (new File(dependency, entry).exists()) { - return true; - } - } - return false; - } - - private File getFileFromUrl(String url) { - if (url.startsWith("file://")) { - return new File(url.substring("file://".length())); - } else if (url.startsWith("jar://")) { - int index = url.indexOf('!'); - return new File(url.substring("file://".length(), index)); - } else if (url.startsWith("jar:file://")) { - int index = url.indexOf('!'); - return new File(url.substring("jar:file://".length(), index)); - } else { - return null; - } - } -} diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuildTarget.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuildTarget.java deleted file mode 100644 index 06a9f0d99..000000000 --- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuildTarget.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright 2017 Alexey Andreev. - * - * 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.teavm.idea.jps; - -import java.io.File; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.builders.BuildRootDescriptor; -import org.jetbrains.jps.builders.BuildRootIndex; -import org.jetbrains.jps.builders.BuildTarget; -import org.jetbrains.jps.builders.BuildTargetRegistry; -import org.jetbrains.jps.builders.ModuleBasedTarget; -import org.jetbrains.jps.builders.TargetOutputIndex; -import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType; -import org.jetbrains.jps.builders.storage.BuildDataPaths; -import org.jetbrains.jps.incremental.CompileContext; -import org.jetbrains.jps.incremental.ModuleBuildTarget; -import org.jetbrains.jps.indices.IgnoredFileIndex; -import org.jetbrains.jps.indices.ModuleExcludeIndex; -import org.jetbrains.jps.model.JpsModel; -import org.jetbrains.jps.model.module.JpsModule; -import org.teavm.idea.jps.model.TeaVMJpsConfiguration; - -public class TeaVMBuildTarget extends ModuleBasedTarget { - private TeaVMJpsConfiguration configuration; - - public TeaVMBuildTarget(TeaVMBuildTargetType targetType, @NotNull JpsModule module, - @NotNull TeaVMJpsConfiguration configuration) { - super(targetType, module); - this.configuration = configuration; - } - - @Override - public boolean isTests() { - return false; - } - - @Override - public String getId() { - return getModule().getName() + "-" + configuration.getTargetType().name(); - } - - @Override - public Collection> computeDependencies(BuildTargetRegistry targetRegistry, - TargetOutputIndex outputIndex) { - return Collections.singleton(new ModuleBuildTarget(myModule, JavaModuleBuildTargetType.PRODUCTION)); - } - - @NotNull - @Override - public List computeRootDescriptors(JpsModel model, ModuleExcludeIndex index, - IgnoredFileIndex ignoredFileIndex, BuildDataPaths dataPaths) { - return Collections.emptyList(); - } - - @Nullable - @Override - public BuildRootDescriptor findRootDescriptor(String rootId, BuildRootIndex rootIndex) { - return null; - } - - @NotNull - @Override - public String getPresentableName() { - return "TeaVM configuration '" + getModule().getName() + "' - " + configuration.getTargetType(); - } - - @NotNull - @Override - public Collection getOutputRoots(CompileContext context) { - return Collections.singleton(new File(configuration.getTargetDirectory())); - } - - public TeaVMJpsConfiguration getConfiguration() { - return configuration; - } -} diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuildTargetType.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuildTargetType.java deleted file mode 100644 index f4d4fad7d..000000000 --- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuildTargetType.java +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright 2017 Alexey Andreev. - * - * 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.teavm.idea.jps; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.jetbrains.jps.builders.BuildTargetLoader; -import org.jetbrains.jps.builders.ModuleBasedBuildTargetType; -import org.jetbrains.jps.model.JpsModel; -import org.jetbrains.jps.model.module.JpsModule; -import org.teavm.idea.jps.model.TeaVMJpsConfiguration; -import org.teavm.tooling.TeaVMTargetType; - -public class TeaVMBuildTargetType extends ModuleBasedBuildTargetType { - public static final String ID = "teavm"; - public static final TeaVMBuildTargetType INSTANCE = new TeaVMBuildTargetType(); - - private TeaVMBuildTargetType() { - super(ID); - } - - @NotNull - @Override - public List computeAllTargets(@NotNull JpsModel model) { - List targets = new ArrayList<>(); - for (JpsModule module : model.getProject().getModules()) { - for (TeaVMJpsConfiguration config : TeaVMJpsConfiguration.getAll(module)) { - targets.add(new TeaVMBuildTarget(this, module, config)); - } - } - return targets; - } - - @NotNull - @Override - public BuildTargetLoader createLoader(@NotNull JpsModel model) { - return new Loader(model); - } - - class Loader extends BuildTargetLoader { - private final Map modules; - - public Loader(JpsModel model) { - modules = new HashMap<>(); - for (JpsModule module : model.getProject().getModules()) { - for (TeaVMJpsConfiguration config : TeaVMJpsConfiguration.getAll(module)) { - modules.put(module.getName() + "-" + config.getTargetType().name(), - new Configuration(module, config.getTargetType())); - } - } - } - - @Nullable - @Override - public TeaVMBuildTarget createTarget(@NotNull String targetId) { - Configuration configuration = modules.get(targetId); - if (configuration == null) { - return null; - } - - for (TeaVMJpsConfiguration jpsConfig : TeaVMJpsConfiguration.getAll(configuration.module)) { - if (jpsConfig.getTargetType() == configuration.type) { - return new TeaVMBuildTarget(TeaVMBuildTargetType.this, configuration.module, jpsConfig); - } - } - - return null; - } - } - - class Configuration { - final JpsModule module; - final TeaVMTargetType type; - - public Configuration(@NotNull JpsModule module, @NotNull TeaVMTargetType type) { - this.module = module; - this.type = type; - } - } -} diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java deleted file mode 100644 index d298aba1f..000000000 --- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilder.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.jps; - -import static org.teavm.idea.jps.remote.TeaVMBuilderAssistant.REMOTE_PORT; -import java.rmi.NotBoundException; -import java.rmi.RemoteException; -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; -import java.util.Collections; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.builders.BuildOutputConsumer; -import org.jetbrains.jps.builders.BuildRootDescriptor; -import org.jetbrains.jps.builders.DirtyFilesHolder; -import org.jetbrains.jps.incremental.CompileContext; -import org.jetbrains.jps.incremental.TargetBuilder; -import org.jetbrains.jps.incremental.messages.BuildMessage; -import org.jetbrains.jps.incremental.messages.CompilerMessage; -import org.teavm.idea.jps.remote.TeaVMBuilderAssistant; -import org.teavm.tooling.builder.BuildException; -import org.teavm.tooling.builder.BuildStrategy; -import org.teavm.tooling.builder.InProcessBuildStrategy; -import org.teavm.tooling.builder.RemoteBuildStrategy; -import org.teavm.tooling.daemon.RemoteBuildService; - -public class TeaVMBuilder extends TargetBuilder { - private TeaVMBuilderAssistant assistant; - private RemoteBuildService buildService; - - public TeaVMBuilder() { - super(Collections.singletonList(TeaVMBuildTargetType.INSTANCE)); - - String portString = System.getProperty(REMOTE_PORT); - if (portString != null) { - try { - Registry registry = LocateRegistry.getRegistry(Integer.parseInt(portString)); - assistant = (TeaVMBuilderAssistant) registry.lookup(TeaVMBuilderAssistant.ID); - } catch (NumberFormatException | RemoteException | NotBoundException e) { - e.printStackTrace(); - } - } - - String daemonPortString = System.getProperty(RemoteBuildService.REMOTE_PORT); - if (daemonPortString != null) { - try { - Registry registry = LocateRegistry.getRegistry(Integer.parseInt(daemonPortString)); - buildService = (RemoteBuildService) registry.lookup(RemoteBuildService.ID); - } catch (NumberFormatException | RemoteException | NotBoundException e) { - e.printStackTrace(); - } - } - } - - @Override - public void build(@NotNull TeaVMBuildTarget target, - @NotNull DirtyFilesHolder holder, - @NotNull BuildOutputConsumer outputConsumer, @NotNull CompileContext context) { - if (assistant == null) { - context.processMessage(new CompilerMessage("TeaVM", BuildMessage.Kind.WARNING, - "No TeaVM builder assistant available. Diagnostic messages will be less informative")); - } - - try { - BuildStrategy buildStrategy = buildService != null - ? new RemoteBuildStrategy(buildService) - : createInProcessBuilder(); - TeaVMBuild build = new TeaVMBuild(context, assistant, buildStrategy, outputConsumer, buildService != null); - - build.perform(target.getModule(), target); - } catch (BuildException e) { - context.processMessage(new CompilerMessage("TeaVM", e.getCause())); - } catch (Exception e) { - context.processMessage(new CompilerMessage("TeaVM", e)); - } - } - - private BuildStrategy createInProcessBuilder() { - return new InProcessBuildStrategy((urls, innerClassLoader) -> { - RenamingClassLoader loader = new RenamingClassLoader(urls, innerClassLoader); - loader.rename("org/objectweb/asm/", "org/teavm/asm/"); - return loader; - }); - } - - @NotNull - @Override - public String getPresentableName() { - return "TeaVM builder"; - } -} diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java deleted file mode 100644 index ba84a0a7e..000000000 --- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMBuilderService.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.jps; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.builders.BuildTargetType; -import org.jetbrains.jps.incremental.BuilderService; -import org.jetbrains.jps.incremental.TargetBuilder; - -public class TeaVMBuilderService extends BuilderService { - @NotNull - @Override - public List> createBuilders() { - return Arrays.asList(new TeaVMBuilder()); - } - - @NotNull - @Override - public List> getTargetTypes() { - return Collections.singletonList(TeaVMBuildTargetType.INSTANCE); - } -} diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMStorage.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMStorage.java deleted file mode 100644 index 8bfa4d536..000000000 --- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMStorage.java +++ /dev/null @@ -1,119 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.jps; - -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; -import java.io.Reader; -import java.io.Writer; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; -import org.jetbrains.jps.incremental.storage.StorageOwner; - -public class TeaVMStorage implements StorageOwner { - private File file; - private List participatingFiles; - private boolean dirty; - - TeaVMStorage(File file, String suffix) throws IOException { - file = new File(file, "teavm-" + suffix + ".storage"); - this.file = file; - if (file.exists()) { - participatingFiles = new ArrayList<>(); - try (Reader innerReader = new InputStreamReader(new FileInputStream(file), StandardCharsets.UTF_8); - BufferedReader reader = new BufferedReader(innerReader)) { - while (true) { - String line = reader.readLine(); - if (line == null) { - break; - } - line = line.trim(); - if (line.isEmpty() || line.startsWith("#")) { - continue; - } - - int index = line.lastIndexOf(':'); - if (index < 0) { - participatingFiles = null; - file.delete(); - break; - } - participatingFiles.add(new Entry(line.substring(0, index), - Long.parseLong(line.substring(index + 1)))); - } - } - } - } - - public void setParticipatingFiles(List participatingFiles) { - if (participatingFiles == null) { - this.participatingFiles = null; - } else { - this.participatingFiles = new ArrayList<>(participatingFiles); - } - dirty = true; - } - - public List getParticipatingFiles() { - return participatingFiles != null ? new ArrayList<>(participatingFiles) : null; - } - - @Override - public void flush(boolean b) { - } - - @Override - public void clean() { - file.delete(); - participatingFiles = null; - } - - @Override - public void close() throws IOException { - if (dirty) { - if (participatingFiles == null) { - if (file.exists()) { - file.delete(); - } - } else { - try (Writer innerWriter = new OutputStreamWriter(new FileOutputStream(file), StandardCharsets.UTF_8); - BufferedWriter writer = new BufferedWriter(innerWriter)) { - for (Entry participatingFile : participatingFiles) { - writer.append(participatingFile.path + ":" + participatingFile.timestamp); - writer.newLine(); - } - } - } - } - } - - public static class Entry { - public final String path; - public final long timestamp; - - public Entry(String path, long timestamp) { - this.path = path; - this.timestamp = timestamp; - } - } -} diff --git a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMStorageProvider.java b/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMStorageProvider.java deleted file mode 100644 index 46e08f2e0..000000000 --- a/tools/idea/jps-plugin/src/main/java/org/teavm/idea/jps/TeaVMStorageProvider.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.jps; - -import java.io.File; -import java.io.IOException; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.jps.builders.storage.StorageProvider; - -public class TeaVMStorageProvider extends StorageProvider { - private String suffix; - - public TeaVMStorageProvider(String suffix) { - this.suffix = suffix; - } - - @NotNull - @Override - public TeaVMStorage createStorage(File file) throws IOException { - return new TeaVMStorage(file, suffix); - } -} diff --git a/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService b/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService deleted file mode 100644 index bd0f40b5d..000000000 --- a/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.incremental.BuilderService +++ /dev/null @@ -1 +0,0 @@ -org.teavm.idea.jps.TeaVMBuilderService \ No newline at end of file diff --git a/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension b/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension deleted file mode 100644 index cebf52ebf..000000000 --- a/tools/idea/jps-plugin/src/main/resources/META-INF/services/org.jetbrains.jps.model.serialization.JpsModelSerializerExtension +++ /dev/null @@ -1 +0,0 @@ -org.teavm.idea.jps.model.TeaVMModelSerializerService \ No newline at end of file diff --git a/tools/idea/jps-plugin/teavm-jps-plugin.iml b/tools/idea/jps-plugin/teavm-jps-plugin.iml deleted file mode 100644 index f724c540a..000000000 --- a/tools/idea/jps-plugin/teavm-jps-plugin.iml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tools/idea/plugin/pom.xml b/tools/idea/plugin/pom.xml deleted file mode 100644 index f9396600d..000000000 --- a/tools/idea/plugin/pom.xml +++ /dev/null @@ -1,197 +0,0 @@ - - - - - - teavm-idea-parent - org.teavm - 0.7.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - teavm-idea - TeaVM IDEA plugin - - - ${basedir}/.. - - - - - org.teavm.idea - openapi - ${idea.version} - provided - - - org.teavm.idea - annotations - ${idea.version} - provided - - - org.teavm.idea - util - ${idea.version} - provided - - - org.teavm.idea - extensions - ${idea.version} - provided - - - org.teavm.idea - jdom - ${idea.version} - provided - - - org.teavm.idea - maven - ${idea.version} - provided - - - org.teavm.idea - maven-server-api - ${idea.version} - provided - - - org.teavm.idea - idea - ${idea.version} - provided - - - org.teavm.idea - platform-api - ${idea.version} - provided - - - org.teavm.idea - platform-impl - ${idea.version} - provided - - - org.teavm.idea - commons-logging - ${idea.version} - provided - - - org.teavm.idea - teavm - ${project.version} - - - - - org.teavm.idea - java-api - ${idea.version} - provided - - - org.teavm.idea - java-impl - ${idea.version} - provided - - - - org.teavm.idea - kotlin-plugin - ${idea.version} - provided - - - - org.teavm.idea - scala-plugin - ${idea.version} - provided - - - - org.teavm - teavm-jps-common - ${project.version} - - - org.teavm - teavm-jps-plugin - ${project.version} - runtime - - - - org.jetbrains.kotlin - kotlin-stdlib - 1.3.61 - provided - - - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - ../../checkstyle.xml - config_loc=${basedir}/../../../ - - - - - org.apache.maven.plugins - maven-assembly-plugin - - - package - - single - - - - - - src/assembly/plugin.xml - - false - - - - - - - src/main/resources - true - - - - - \ No newline at end of file diff --git a/tools/idea/plugin/src/assembly/plugin.xml b/tools/idea/plugin/src/assembly/plugin.xml deleted file mode 100644 index 4157650dc..000000000 --- a/tools/idea/plugin/src/assembly/plugin.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - idea-plugin - - - zip - - - - - lib - - org.teavm.idea:teavm:* - - teavm.jar - - - lib - - org.teavm:teavm-jps-common - - teavm-jps-common.jar - - - lib/jps - - org.teavm:teavm-jps-plugin - - teavm-jps-plugin.jar - - - - - - lib - target/${project.artifactId}-${project.version}.jar - teavm-plugin.jar - - - \ No newline at end of file diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMDaemonComponent.java b/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMDaemonComponent.java deleted file mode 100644 index 3cb43053f..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMDaemonComponent.java +++ /dev/null @@ -1,147 +0,0 @@ -/* - * Copyright 2017 Alexey Andreev. - * - * 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.teavm.idea; - -import com.intellij.openapi.components.ApplicationComponent; -import com.intellij.openapi.components.ServiceManager; -import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jetbrains.annotations.NotNull; -import org.teavm.idea.jps.model.TeaVMJpsWorkspaceConfiguration; -import org.teavm.tooling.daemon.BuildDaemon; -import org.teavm.tooling.daemon.DaemonInfo; -import org.teavm.tooling.daemon.DaemonLog; - -public class TeaVMDaemonComponent implements ApplicationComponent { - private DaemonInfo daemonInfo; - private boolean incremental; - private int daemonMemory; - - @Override - public void initComponent() { - TeaVMWorkspaceConfigurationStorage configurationStorage = ServiceManager.getService( - TeaVMWorkspaceConfigurationStorage.class); - if (configurationStorage != null) { - TeaVMJpsWorkspaceConfiguration configuration = configurationStorage.getState(); - incremental = configuration.isIncremental(); - daemonMemory = configuration.getDaemonMemory(); - if (configuration.isDaemonEnabled()) { - startDaemon(); - } - } - } - - private TeaVMWorkspaceConfigurationStorage getConfigurationStorage() { - return ServiceManager.getService(TeaVMWorkspaceConfigurationStorage.class); - } - - @Override - public void disposeComponent() { - if (daemonInfo != null) { - daemonInfo.getProcess().destroy(); - } - } - - public boolean isDaemonRunning() { - return daemonInfo != null; - } - - public int getDaemonPort() { - return daemonInfo.getPort(); - } - - public void startDaemon() { - if (daemonInfo == null) { - try { - Log log = LogFactory.getLog(TeaVMDaemonComponent.class); - daemonInfo = BuildDaemon.start(incremental, daemonMemory, new LogWrapper(log), - DaemonUtil.detectClassPath().toArray(new String[0])); - } catch (IOException e) { - throw new RuntimeException(e); - } - updateConfiguration(true); - } - } - - public void stopDaemon() { - if (daemonInfo != null) { - daemonInfo.getProcess().destroy(); - daemonInfo = null; - updateConfiguration(false); - } - } - - public boolean isIncremental() { - return incremental; - } - - public void setIncremental(boolean incremental) { - this.incremental = incremental; - } - - public int getDaemonMemory() { - return daemonMemory; - } - - public void setDaemonMemory(int daemonMemory) { - this.daemonMemory = daemonMemory; - } - - public void applyChanges() { - TeaVMWorkspaceConfigurationStorage configurationStorage = getConfigurationStorage(); - TeaVMJpsWorkspaceConfiguration configuration = configurationStorage.getState(); - configuration.setIncremental(incremental); - configuration.setDaemonMemory(daemonMemory); - configurationStorage.loadState(configuration); - } - - private void updateConfiguration(boolean daemonEnabled) { - TeaVMWorkspaceConfigurationStorage configurationStorage = getConfigurationStorage(); - TeaVMJpsWorkspaceConfiguration configuration = configurationStorage.getState(); - configuration.setDaemonEnabled(daemonEnabled); - configurationStorage.loadState(configuration); - } - - @NotNull - @Override - public String getComponentName() { - return "TeaVM daemon"; - } - - static class LogWrapper implements DaemonLog { - private Log log; - - public LogWrapper(Log log) { - this.log = log; - } - - @Override - public void error(String s) { - log.error(s); - } - - @Override - public void error(String s, Throwable throwable) { - log.error(s, throwable); - } - - @Override - public void info(String s) { - log.info(s); - } - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacet.java b/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacet.java deleted file mode 100644 index ef4278dd4..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacet.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea; - -import com.intellij.facet.Facet; -import com.intellij.facet.FacetType; -import com.intellij.openapi.module.Module; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class TeaVMFacet extends Facet { - public TeaVMFacet(@NotNull FacetType facetType, @NotNull Module module, - @NotNull String name, @NotNull TeaVMFacetConfiguration configuration, @Nullable Facet underlyingFacet) { - super(facetType, module, name, configuration, underlyingFacet); - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacetConfiguration.java b/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacetConfiguration.java deleted file mode 100644 index d90bd94a3..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacetConfiguration.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea; - -import com.intellij.facet.FacetConfiguration; -import com.intellij.facet.ui.FacetEditorContext; -import com.intellij.facet.ui.FacetEditorTab; -import com.intellij.facet.ui.FacetValidatorsManager; -import com.intellij.openapi.components.PersistentStateComponent; -import com.intellij.openapi.util.InvalidDataException; -import com.intellij.openapi.util.WriteExternalException; -import org.jdom.Element; -import org.jetbrains.annotations.Nullable; -import org.teavm.idea.jps.model.TeaVMJpsConfiguration; -import org.teavm.idea.ui.TeaVMFacetEditorTab; - -public class TeaVMFacetConfiguration implements FacetConfiguration, PersistentStateComponent { - private TeaVMJpsConfiguration state = new TeaVMJpsConfiguration(); - - @Override - public FacetEditorTab[] createEditorTabs(FacetEditorContext editorContext, - FacetValidatorsManager validatorsManager) { - return new FacetEditorTab[] { new TeaVMFacetEditorTab(editorContext.getModule(), state) }; - } - - @Override - public void readExternal(Element element) throws InvalidDataException { - } - - @Override - public void writeExternal(Element element) throws WriteExternalException { - } - - @Nullable - @Override - public TeaVMJpsConfiguration getState() { - return state; - } - - @Override - public void loadState(TeaVMJpsConfiguration state) { - this.state = state; - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacetType.java b/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacetType.java deleted file mode 100644 index 40c23c719..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMFacetType.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea; - -import com.intellij.facet.Facet; -import com.intellij.facet.FacetType; -import com.intellij.facet.FacetTypeId; -import com.intellij.facet.FacetTypeRegistry; -import com.intellij.openapi.module.JavaModuleType; -import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.util.IconLoader; -import javax.swing.Icon; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class TeaVMFacetType extends FacetType { - public static final FacetTypeId TYPE_ID = new FacetTypeId<>("teavm-js"); - private static final Icon icon = IconLoader.getIcon("/teavm-16.png"); - - public TeaVMFacetType() { - super(TYPE_ID, "teavm-js", "TeaVM (JS)"); - } - - @Override - public TeaVMFacetConfiguration createDefaultConfiguration() { - return new TeaVMFacetConfiguration(); - } - - @Override - public TeaVMFacet createFacet(@NotNull Module module, String name, @NotNull TeaVMFacetConfiguration configuration, - @Nullable Facet underlyingFacet) { - return new TeaVMFacet(this, module, name, configuration, underlyingFacet); - } - - @Override - public boolean isSuitableModuleType(ModuleType moduleType) { - return moduleType instanceof JavaModuleType; - } - - @Nullable - @Override - public Icon getIcon() { - return icon; - } - - @NotNull - public static TeaVMFacetType getInstance() { - return (TeaVMFacetType) FacetTypeRegistry.getInstance().findFacetType(TYPE_ID); - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMJPSConfigurator.java b/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMJPSConfigurator.java deleted file mode 100644 index 99e744739..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMJPSConfigurator.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea; - -import static org.teavm.idea.jps.remote.TeaVMBuilderAssistant.REMOTE_PORT; -import com.intellij.compiler.server.BuildProcessParametersProvider; -import com.intellij.openapi.application.Application; -import com.intellij.openapi.application.ApplicationManager; -import java.util.ArrayList; -import java.util.List; -import org.jetbrains.annotations.NotNull; -import org.teavm.tooling.daemon.RemoteBuildService; - -public class TeaVMJPSConfigurator extends BuildProcessParametersProvider { - private TeaVMJPSRemoteService remoteService; - private TeaVMDaemonComponent daemonComponent; - - public TeaVMJPSConfigurator() { - Application app = ApplicationManager.getApplication(); - this.remoteService = app.getComponent(TeaVMJPSRemoteService.class); - this.daemonComponent = app.getComponent(TeaVMDaemonComponent.class); - } - - @NotNull - @Override - public List getVMArguments() { - List result = new ArrayList<>(); - result.add("-D" + REMOTE_PORT + "=" + remoteService.getPort()); - if (daemonComponent.isDaemonRunning()) { - result.add("-D" + RemoteBuildService.REMOTE_PORT + "=" + daemonComponent.getDaemonPort()); - } - return result; - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMJPSRemoteService.java b/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMJPSRemoteService.java deleted file mode 100644 index 05a77af02..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMJPSRemoteService.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea; - -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.components.ApplicationComponent; -import com.intellij.openapi.editor.Document; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.project.ProjectManager; -import com.intellij.psi.JavaPsiFacade; -import com.intellij.psi.PsiClass; -import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiFile; -import com.intellij.psi.PsiMethod; -import com.intellij.psi.PsiParameter; -import com.intellij.psi.PsiType; -import com.intellij.psi.search.GlobalSearchScope; -import com.siyeh.ig.fixes.MemberSignature; -import java.rmi.AlreadyBoundException; -import java.rmi.NotBoundException; -import java.rmi.RemoteException; -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; -import java.rmi.server.UnicastRemoteObject; -import java.util.Random; -import org.jetbrains.annotations.NotNull; -import org.teavm.idea.jps.remote.TeaVMBuilderAssistant; -import org.teavm.idea.jps.remote.TeaVMElementLocation; - -public class TeaVMJPSRemoteService extends UnicastRemoteObject implements ApplicationComponent, TeaVMBuilderAssistant { - private static final int MIN_PORT = 10000; - private static final int MAX_PORT = 1 << 16; - private ProjectManager projectManager; - private int port; - private Registry registry; - - public TeaVMJPSRemoteService() throws RemoteException { - super(); - } - - private synchronized ProjectManager getProjectManager() { - if (projectManager == null) { - projectManager = ProjectManager.getInstance(); - } - return projectManager; - } - - @Override - public void initComponent() { - Random random = new Random(); - for (int i = 0; i < 20; ++i) { - port = random.nextInt(MAX_PORT - MIN_PORT) + MIN_PORT; - try { - registry = LocateRegistry.createRegistry(port); - } catch (RemoteException e) { - continue; - } - try { - registry.bind(TeaVMBuilderAssistant.ID, this); - } catch (RemoteException | AlreadyBoundException e) { - throw new IllegalStateException("Could not bind remote build assistant service", e); - } - return; - } - throw new IllegalStateException("Could not create RMI registry"); - } - - public int getPort() { - return port; - } - - @Override - public void disposeComponent() { - try { - registry.unbind(TeaVMBuilderAssistant.ID); - UnicastRemoteObject.unexportObject(registry, true); - } catch (RemoteException | NotBoundException e) { - throw new IllegalStateException("Could not clean-up RMI server", e); - } - } - - @NotNull - @Override - public String getComponentName() { - return "TeaVM JPS service"; - } - - @Override - public TeaVMElementLocation getMethodLocation(String className, String methodName, String methodDesc) { - TeaVMElementLocation[] resultHolder = new TeaVMElementLocation[1]; - - ApplicationManager.getApplication().runReadAction(() -> { - for (Project project : getProjectManager().getOpenProjects()) { - JavaPsiFacade psi = JavaPsiFacade.getInstance(project); - PsiClass cls = psi.findClass(className, GlobalSearchScope.allScope(project)); - if (cls == null) { - continue; - } - - for (PsiMethod method : cls.getAllMethods()) { - if (!method.getName().equals(methodName) || !getMethodSignature(method).equals(methodDesc)) { - continue; - } - resultHolder[0] = getMethodLocation(method); - return; - } - } - }); - - return resultHolder[0]; - } - - private String getMethodSignature(PsiMethod method) { - StringBuilder sb = new StringBuilder("("); - for (PsiParameter parameter : method.getParameterList().getParameters()) { - sb.append(MemberSignature.createTypeSignature(parameter.getType())); - } - sb.append(")"); - - PsiType returnType = method.getReturnType(); - sb.append(MemberSignature.createTypeSignature(returnType != null ? returnType : PsiType.VOID)); - return sb.toString(); - } - - private TeaVMElementLocation getMethodLocation(PsiMethod method) { - PsiElement element = method.getNameIdentifier(); - if (element == null) { - element = method.getNavigationElement(); - } - PsiFile psiFile = element.getContainingFile(); - Document document = psiFile.getViewProvider().getDocument(); - int offset = element.getTextRange().getStartOffset(); - int line = offset >= 0 ? document.getLineNumber(offset) + 1 : -1; - int column = offset >= 0 ? offset - document.getLineStartOffset(line) + 1 : -1; - return new TeaVMElementLocation(offset, element.getTextRange().getEndOffset(), - line, column, psiFile.getVirtualFile().getPath()); - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMWebAssemblyFacetType.java b/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMWebAssemblyFacetType.java deleted file mode 100644 index 44ba647b7..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMWebAssemblyFacetType.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea; - -import com.intellij.facet.Facet; -import com.intellij.facet.FacetType; -import com.intellij.facet.FacetTypeId; -import com.intellij.facet.FacetTypeRegistry; -import com.intellij.openapi.module.JavaModuleType; -import com.intellij.openapi.module.Module; -import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.util.IconLoader; -import javax.swing.Icon; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -public class TeaVMWebAssemblyFacetType extends FacetType { - public static final FacetTypeId TYPE_ID = new FacetTypeId<>("teavm-wasm"); - private static final Icon icon = IconLoader.findIcon("/teavm-16.png"); - - public TeaVMWebAssemblyFacetType() { - super(TYPE_ID, "teavm-wasm", "TeaVM (WebAssembly)"); - } - - @Override - public TeaVMFacetConfiguration createDefaultConfiguration() { - return new TeaVMFacetConfiguration(); - } - - @Override - public TeaVMFacet createFacet(@NotNull Module module, String name, @NotNull TeaVMFacetConfiguration configuration, - @Nullable Facet underlyingFacet) { - return new TeaVMFacet(this, module, name, configuration, underlyingFacet); - } - - @Override - public boolean isSuitableModuleType(ModuleType moduleType) { - return moduleType instanceof JavaModuleType; - } - - @Nullable - @Override - public Icon getIcon() { - return icon; - } - - @NotNull - public static TeaVMWebAssemblyFacetType getInstance() { - return (TeaVMWebAssemblyFacetType) FacetTypeRegistry.getInstance().findFacetType(TYPE_ID); - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMWorkspaceConfigurationStorage.java b/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMWorkspaceConfigurationStorage.java deleted file mode 100644 index f8e5cd7f1..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/TeaVMWorkspaceConfigurationStorage.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright 2017 Alexey Andreev. - * - * 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.teavm.idea; - -import com.intellij.openapi.components.PersistentStateComponent; -import com.intellij.openapi.components.State; -import com.intellij.openapi.components.Storage; -import org.jetbrains.annotations.Nullable; -import org.teavm.idea.jps.model.TeaVMJpsWorkspaceConfiguration; - -@State(name = "teavm", storages = @Storage(value = "teavm.xml")) -public class TeaVMWorkspaceConfigurationStorage implements PersistentStateComponent { - private TeaVMJpsWorkspaceConfiguration state = new TeaVMJpsWorkspaceConfiguration(); - - @Nullable - @Override - public TeaVMJpsWorkspaceConfiguration getState() { - return state.createCopy(); - } - - @Override - public void loadState(TeaVMJpsWorkspaceConfiguration configuration) { - state.applyChanges(configuration); - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMValue.java b/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMValue.java deleted file mode 100644 index ffde5800f..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMValue.java +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.debug; - -import com.intellij.util.PlatformIcons; -import com.intellij.xdebugger.frame.XCompositeNode; -import com.intellij.xdebugger.frame.XNamedValue; -import com.intellij.xdebugger.frame.XValueNode; -import com.intellij.xdebugger.frame.XValuePlace; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import javax.swing.Icon; -import org.jetbrains.annotations.NotNull; -import org.teavm.common.Promise; -import org.teavm.debugging.Value; -import org.teavm.debugging.Variable; - -public class TeaVMValue extends XNamedValue { - private boolean root; - private Value innerValue; - - public TeaVMValue(@NotNull String name, boolean root, Value innerValue) { - super(name); - this.root = root; - this.innerValue = innerValue; - } - - @Override - public void computePresentation(@NotNull XValueNode node, @NotNull XValuePlace place) { - Icon icon = root ? PlatformIcons.VARIABLE_ICON : PlatformIcons.FIELD_ICON; - innerValue.getRepresentation() - .then(representation -> representation != null ? representation : "null") - .thenVoid(representation -> { - innerValue.getType().thenVoid(type -> { - if (Objects.equals(type, "java.lang.String")) { - getStringRepresentation().thenVoid(str -> node.setPresentation(icon, type, str, true)); - } else { - innerValue.hasInnerStructure().then(innerStructure -> { - node.setPresentation(icon, type, representation, innerStructure); - return null; - }); - } - }); - }); - - } - - private Promise getStringRepresentation() { - return innerValue.getProperties().thenAsync(properties -> { - Variable charactersProperty = properties.get("characters"); - if (charactersProperty == null) { - return errorString(); - } - return charactersProperty.getValue().getProperties().thenAsync(dataValueProperties -> { - int[] indexes = dataValueProperties.keySet().stream() - .filter(t -> isDigits(t)) - .mapToInt(Integer::parseInt) - .toArray(); - int maxIndex = Math.min(Arrays.stream(indexes).max().orElse(-1) + 1, 256); - char[] chars = new char[maxIndex]; - List> promises = new ArrayList<>(); - for (int i = 0; i < maxIndex; ++i) { - Variable charProperty = dataValueProperties.get(Integer.toString(i)); - if (charProperty != null) { - int index = i; - promises.add(charProperty.getValue().getRepresentation().thenVoid(charRepr -> { - if (isDigits(charRepr)) { - chars[index] = (char) Integer.parseInt(charRepr); - } - })); - } - } - return Promise.allVoid(promises).thenAsync(v -> Promise.of(new String(chars))); - }); - }); - } - - private Promise errorString() { - return Promise.of(""); - } - - private static boolean isDigits(String str) { - for (int i = 0; i < str.length(); ++i) { - char c = str.charAt(i); - if (c < '0' || c > '9') { - return false; - } - } - return true; - } - - @Override - public void computeChildren(@NotNull XCompositeNode node) { - TeaVMStackFrame.computeChildrenImpl(node, innerValue.getProperties(), false); - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/maven/TeaVMMavenImporter.java b/tools/idea/plugin/src/main/java/org/teavm/idea/maven/TeaVMMavenImporter.java deleted file mode 100644 index 486b564d1..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/maven/TeaVMMavenImporter.java +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.maven; - -import com.intellij.facet.FacetManager; -import com.intellij.facet.FacetType; -import com.intellij.facet.ModifiableFacetModel; -import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider; -import com.intellij.openapi.module.Module; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import org.jdom.Element; -import org.jetbrains.idea.maven.importing.MavenImporter; -import org.jetbrains.idea.maven.importing.MavenRootModelAdapter; -import org.jetbrains.idea.maven.model.MavenPlugin; -import org.jetbrains.idea.maven.project.MavenProject; -import org.jetbrains.idea.maven.project.MavenProjectChanges; -import org.jetbrains.idea.maven.project.MavenProjectsProcessorTask; -import org.jetbrains.idea.maven.project.MavenProjectsTree; -import org.teavm.idea.TeaVMFacet; -import org.teavm.idea.TeaVMFacetConfiguration; -import org.teavm.idea.TeaVMFacetType; -import org.teavm.idea.TeaVMWebAssemblyFacetType; -import org.teavm.idea.jps.model.TeaVMJpsConfiguration; -import org.teavm.idea.jps.model.TeaVMProperty; -import org.teavm.tooling.TeaVMTargetType; - -public class TeaVMMavenImporter extends MavenImporter { - public TeaVMMavenImporter() { - super("org.teavm", "teavm-maven-plugin"); - } - - @Override - public void preProcess(Module module, MavenProject mavenProject, MavenProjectChanges changes, - IdeModifiableModelsProvider modifiableModelsProvider) { - } - - @Override - public void process(IdeModifiableModelsProvider modifiableModelsProvider, Module module, - MavenRootModelAdapter rootModel, MavenProjectsTree mavenModel, MavenProject mavenProject, - MavenProjectChanges changes, Map mavenProjectToModuleName, - List postTasks) { - FacetManager facetManager = FacetManager.getInstance(module); - ModifiableFacetModel facetModel = modifiableModelsProvider.getModifiableFacetModel(module); - Set targetTypes = new HashSet<>(); - for (MavenPlugin mavenPlugin : mavenProject.getPlugins()) { - if (mavenPlugin.getGroupId().equals(myPluginGroupID) - && mavenPlugin.getArtifactId().equals(myPluginArtifactID)) { - updateConfiguration(mavenPlugin, facetModel, facetManager, targetTypes); - } - } - } - - private void updateConfiguration(MavenPlugin plugin, ModifiableFacetModel facetModel, FacetManager facetManager, - Set targetTypes) { - if (plugin.getConfigurationElement() != null) { - updateConfiguration(plugin.getConfigurationElement(), facetModel, facetManager, targetTypes); - } - - for (MavenPlugin.Execution execution : plugin.getExecutions()) { - if (execution.getGoals().contains("compile")) { - if (execution.getConfigurationElement() != null) { - updateConfiguration(execution.getConfigurationElement(), facetModel, facetManager, targetTypes); - } - } - } - } - - private void updateConfiguration(Element source, ModifiableFacetModel facetModel, FacetManager facetManager, - Set targetTypes) { - FacetType facetType; - switch (getTargetType(source)) { - case JAVASCRIPT: - facetType = TeaVMFacetType.getInstance(); - break; - case WEBASSEMBLY: - facetType = TeaVMWebAssemblyFacetType.getInstance(); - break; - default: - return; - } - - if (!targetTypes.add(facetType.getStringId())) { - return; - } - - TeaVMFacet facet = facetManager.getFacetByType(facetType.getId()); - - boolean justCreated = false; - if (facet == null) { - facet = facetManager.createFacet(facetType, facetType.getDefaultFacetName(), null); - facetModel.addFacet(facet); - justCreated = true; - } - - TeaVMJpsConfiguration configuration = facet.getConfiguration().getState(); - if (justCreated) { - configuration.setSkipped(true); - } - - for (Element child : source.getChildren()) { - switch (child.getName()) { - case "sourceFilesCopied": - if (justCreated) { - configuration.setSourceFilesCopied(true); - } - break; - case "sourceMapsGenerated": - if (justCreated) { - configuration.setSourceMapsFileGenerated(true); - } - break; - case "targetDirectory": - configuration.setTargetDirectory(child.getTextTrim()); - break; - case "mainClass": - configuration.setMainClass(child.getTextTrim()); - break; - case "properties": - configuration.setProperties(extractProperties(child)); - break; - } - } - - facet.getConfiguration().loadState(configuration); - } - - private List extractProperties(Element element) { - List properties = new ArrayList<>(); - for (Element child : element.getChildren()) { - TeaVMProperty property = new TeaVMProperty(); - property.setKey(child.getName()); - property.setValue(child.getTextTrim()); - properties.add(property); - } - return properties; - } - - private TeaVMTargetType getTargetType(Element source) { - for (Element child : source.getChildren()) { - if (child.getName().equals("targetType")) { - try { - return TeaVMTargetType.valueOf(child.getTextTrim()); - } catch (IllegalArgumentException e) { - // do nothing, continue iterating - } - } - } - return TeaVMTargetType.JAVASCRIPT; - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMConfigurable.java b/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMConfigurable.java deleted file mode 100644 index 80f1a4277..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMConfigurable.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.ui; - -import com.intellij.openapi.module.Module; -import com.intellij.openapi.options.Configurable; -import javax.swing.JComponent; -import org.jetbrains.annotations.Nls; -import org.jetbrains.annotations.Nullable; -import org.teavm.idea.jps.model.TeaVMJpsConfiguration; - -public class TeaVMConfigurable implements Configurable { - private final Module module; - private TeaVMConfigurationPanel panel; - private TeaVMJpsConfiguration configuration; - - public TeaVMConfigurable(Module module, TeaVMJpsConfiguration configuration) { - this.module = module; - this.configuration = configuration; - } - - @Nls - @Override - public String getDisplayName() { - return "TeaVM"; - } - - @Nullable - @Override - public String getHelpTopic() { - return null; - } - - @Nullable - @Override - public JComponent createComponent() { - if (panel == null) { - panel = new TeaVMConfigurationPanel(module.getProject()); - } - return panel; - } - - @Override - public boolean isModified() { - return panel != null && panel.isModified(); - } - - @Override - public void apply() { - panel.save(configuration); - } - - @Override - public void reset() { - panel.load(configuration); - } - - @Override - public void disposeUIResources() { - this.panel = null; - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMConfigurationPanel.java b/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMConfigurationPanel.java deleted file mode 100644 index 3edb5f4ad..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMConfigurationPanel.java +++ /dev/null @@ -1,373 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.ui; - -import com.intellij.ide.util.TreeClassChooser; -import com.intellij.ide.util.TreeClassChooserFactory; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.fileChooser.FileChooserDescriptor; -import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.ui.TextFieldWithBrowseButton; -import com.intellij.openapi.util.Computable; -import com.intellij.psi.PsiClass; -import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.util.PsiMethodUtil; -import com.intellij.ui.IdeBorderFactory; -import com.intellij.ui.ToolbarDecorator; -import com.intellij.ui.components.JBLabel; -import com.intellij.ui.table.JBTable; -import com.intellij.util.ui.EditableModel; -import java.awt.BorderLayout; -import java.awt.Font; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Function; -import java.util.function.Supplier; -import java.util.stream.Collectors; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JComboBox; -import javax.swing.JPanel; -import javax.swing.table.AbstractTableModel; -import org.teavm.idea.jps.model.TeaVMJpsConfiguration; -import org.teavm.idea.jps.model.TeaVMProperty; - -class TeaVMConfigurationPanel extends JPanel { - private final JComboBox> skipField = new JComboBox<>(new DefaultComboBoxModel<>()); - private final TextFieldWithBrowseButton mainClassField = new TextFieldWithBrowseButton(event -> chooseMainClass()); - private final TextFieldWithBrowseButton targetDirectoryField = new TextFieldWithBrowseButton(); - private final JComboBox> sourceMapsField = new JComboBox<>(new DefaultComboBoxModel<>()); - private final JComboBox> copySourcesField = new JComboBox<>(new DefaultComboBoxModel<>()); - private final JBTable propertiesTable = new JBTable(); - private final PropertiesModel propertiesModel = new PropertiesModel(); - private final TeaVMJpsConfiguration initialConfiguration = new TeaVMJpsConfiguration(); - private final Project project; - - private final List> sourceMapsOptions = Arrays.asList(new ComboBoxItem<>(true, "Generate"), - new ComboBoxItem<>(false, "Skip")); - - private final List> copySourcesOptions = Arrays.asList(new ComboBoxItem<>(true, "Copy"), - new ComboBoxItem<>(false, "Skip")); - - private final List> skipOptions = Arrays.asList(new ComboBoxItem<>(true, "Skip"), - new ComboBoxItem<>(false, "Don't skip")); - - private final List> fields = Arrays.asList( - new Field<>(TeaVMJpsConfiguration::setSkipped, TeaVMJpsConfiguration::isSkipped, - value -> skipField.setSelectedIndex(value ? 0 : 1), - () -> skipOptions.get(skipField.getSelectedIndex()).value), - new Field<>(TeaVMJpsConfiguration::setMainClass, TeaVMJpsConfiguration::getMainClass, - mainClassField::setText, mainClassField::getText), - new Field<>(TeaVMJpsConfiguration::setTargetDirectory, TeaVMJpsConfiguration::getTargetDirectory, - targetDirectoryField::setText, targetDirectoryField::getText), - new Field<>(TeaVMJpsConfiguration::setSourceMapsFileGenerated, - TeaVMJpsConfiguration::isSourceMapsFileGenerated, - value -> sourceMapsField.setSelectedIndex(value ? 0 : 1), - () -> sourceMapsOptions.get(sourceMapsField.getSelectedIndex()).value), - new Field<>(TeaVMJpsConfiguration::setSourceFilesCopied, - TeaVMJpsConfiguration::isSourceFilesCopied, - value -> copySourcesField.setSelectedIndex(value ? 0 : 1), - () -> copySourcesOptions.get(copySourcesField.getSelectedIndex()).value) - ); - - TeaVMConfigurationPanel(Project project) { - this.project = project; - propertiesTable.setModel(propertiesModel); - setupLayout(); - - FileChooserDescriptor targetDirectoryChooserDescriptor = FileChooserDescriptorFactory - .createSingleFolderDescriptor(); - targetDirectoryField.addBrowseFolderListener("Target Directory", "Please, select folder where TeaVM should" - + "write generated JS files", project, targetDirectoryChooserDescriptor); - - sourceMapsOptions.forEach(sourceMapsField::addItem); - copySourcesOptions.forEach(copySourcesField::addItem); - skipOptions.forEach(skipField::addItem); - } - - private void setupLayout() { - setLayout(new GridBagLayout()); - - GridBagConstraints labelConstraints = new GridBagConstraints(); - labelConstraints.gridwidth = GridBagConstraints.REMAINDER; - labelConstraints.anchor = GridBagConstraints.BASELINE_LEADING; - labelConstraints.weightx = 1; - labelConstraints.weighty = 1; - labelConstraints.insets.left = 5; - labelConstraints.insets.right = 5; - - GridBagConstraints descriptionConstraints = (GridBagConstraints) labelConstraints.clone(); - descriptionConstraints.fill = GridBagConstraints.BOTH; - descriptionConstraints.anchor = GridBagConstraints.BASELINE_LEADING; - descriptionConstraints.insets.top = 3; - - GridBagConstraints fieldConstraints = new GridBagConstraints(); - fieldConstraints.gridwidth = GridBagConstraints.REMAINDER; - fieldConstraints.fill = GridBagConstraints.HORIZONTAL; - fieldConstraints.anchor = GridBagConstraints.BASELINE_LEADING; - fieldConstraints.weightx = 1; - fieldConstraints.weighty = 1; - fieldConstraints.insets.top = 5; - fieldConstraints.insets.bottom = 20; - fieldConstraints.insets.left = 10; - fieldConstraints.insets.right = 10; - - add(bold(new JBLabel("Skip TeaVM compilation")), labelConstraints); - add(skipField, fieldConstraints); - - add(bold(new JBLabel("Main class")), labelConstraints); - add(mainClassField, fieldConstraints); - - add(bold(new JBLabel("Target directory")), labelConstraints); - add(targetDirectoryField, fieldConstraints); - - fieldConstraints.fill = GridBagConstraints.NONE; - - add(bold(new JBLabel("Source maps")), labelConstraints); - add(new JBLabel("Indicates whether TeaVM should generate source maps."), descriptionConstraints); - add(new JBLabel("With source maps you can debug code in the browser's devtools."), descriptionConstraints); - add(sourceMapsField, fieldConstraints); - - add(bold(new JBLabel("Copy source code")), labelConstraints); - add(new JBLabel("Source maps require your server to provide source code."), descriptionConstraints); - add(new JBLabel("TeaVM can copy source code to the corresponding location,"), descriptionConstraints); - add(new JBLabel("which is very convenient if you are going to debug in the browser."), descriptionConstraints); - add(copySourcesField, fieldConstraints); - - GridBagConstraints constraints = new GridBagConstraints(); - constraints.fill = GridBagConstraints.BOTH; - constraints.weighty = 100; - constraints.weightx = 1; - - JPanel propertiesPanel = new JPanel(new BorderLayout()); - propertiesPanel.setBorder(IdeBorderFactory.createTitledBorder("Properties")); - propertiesPanel.add(ToolbarDecorator.createDecorator(propertiesTable).createPanel(), BorderLayout.CENTER); - - add(propertiesPanel, constraints); - } - - private static JBLabel bold(JBLabel label) { - label.setFont(label.getFont().deriveFont(Font.BOLD)); - return label; - } - - void load(TeaVMJpsConfiguration config) { - if (config == null) { - config = new TeaVMJpsConfiguration(); - } - updateInitialConfiguration(config); - for (Field field : fields) { - loadField(field, config); - } - - copyProperties(config.getProperties(), propertiesModel.getProperties()); - } - - void save(TeaVMJpsConfiguration config) { - for (Field field : fields) { - saveField(field, config); - } - copyProperties(propertiesModel.getProperties(), config.getProperties()); - updateInitialConfiguration(config); - } - - boolean isModified() { - return fields.stream().anyMatch(this::isFieldModified) || arePropertiesModified(); - } - - private boolean isFieldModified(Field field) { - return !Objects.equals(field.dataSupplier.apply(initialConfiguration), field.editSupplier.get()); - } - - private boolean arePropertiesModified() { - if (initialConfiguration.getProperties().size() != propertiesModel.getProperties().size()) { - return true; - } - - for (int i = 0; i < initialConfiguration.getProperties().size(); ++i) { - TeaVMProperty initialProperty = initialConfiguration.getProperties().get(i); - TeaVMProperty property = propertiesModel.getProperties().get(i); - if (!initialProperty.getKey().equals(property.getKey()) - || !initialProperty.getValue().equals(property.getValue())) { - return true; - } - } - - return false; - } - - private void updateInitialConfiguration(TeaVMJpsConfiguration config) { - for (Field field : fields) { - copyField(field, config); - } - - copyProperties(config.getProperties(), initialConfiguration.getProperties()); - } - - private void copyProperties(List from, List to) { - to.clear(); - to.addAll(from.stream().map(property -> property.createCopy()).collect(Collectors.toList())); - } - - private void copyField(Field field, TeaVMJpsConfiguration config) { - field.dataConsumer.accept(initialConfiguration, field.dataSupplier.apply(config)); - } - - private void loadField(Field field, TeaVMJpsConfiguration config) { - field.editConsumer.accept(field.dataSupplier.apply(config)); - } - - private void saveField(Field field, TeaVMJpsConfiguration config) { - field.dataConsumer.accept(config, field.editSupplier.get()); - } - - private void chooseMainClass() { - TreeClassChooser chooser = TreeClassChooserFactory - .getInstance(project) - .createWithInnerClassesScopeChooser("Choose main class", - GlobalSearchScope.allScope(project), this::isMainClass, null); - chooser.showDialog(); - PsiClass cls = chooser.getSelected(); - if (cls != null) { - mainClassField.setText(cls.getQualifiedName()); - } - } - - private boolean isMainClass(PsiClass cls) { - return ApplicationManager.getApplication().runReadAction((Computable) () -> { - return PsiMethodUtil.MAIN_CLASS.value(cls) && PsiMethodUtil.hasMainMethod(cls); - }); - } - - private static class ComboBoxItem { - final T value; - private final String title; - - ComboBoxItem(T value, String title) { - this.value = value; - this.title = title; - } - - @Override - public String toString() { - return title; - } - } - - private static class Field { - final BiConsumer dataConsumer; - final Function dataSupplier; - final Consumer editConsumer; - final Supplier editSupplier; - - Field(BiConsumer dataConsumer, Function dataSupplier, - Consumer editConsumer, Supplier editSupplier) { - this.dataConsumer = dataConsumer; - this.dataSupplier = dataSupplier; - this.editConsumer = editConsumer; - this.editSupplier = editSupplier; - } - } - - class PropertiesModel extends AbstractTableModel implements EditableModel { - private List properties = new ArrayList<>(); - - List getProperties() { - return properties; - } - - @Override - public void addRow() { - properties.add(new TeaVMProperty()); - } - - @Override - public void exchangeRows(int oldIndex, int newIndex) { - TeaVMProperty old = properties.get(oldIndex); - properties.set(oldIndex, properties.get(newIndex)); - properties.set(newIndex, old); - } - - @Override - public boolean canExchangeRows(int oldIndex, int newIndex) { - return true; - } - - @Override - public void removeRow(int idx) { - properties.remove(idx); - } - - @Override - public int getRowCount() { - return properties.size(); - } - - @Override - public int getColumnCount() { - return 2; - } - - @Override - public String getColumnName(int column) { - switch (column) { - case 0: - return "Name"; - case 1: - return "Value"; - default: - throw new IllegalArgumentException(); - } - } - - @Override - public Object getValueAt(int rowIndex, int columnIndex) { - switch (columnIndex) { - case 0: - return properties.get(rowIndex).getKey(); - case 1: - return properties.get(rowIndex).getValue(); - default: - throw new IllegalArgumentException(); - } - } - - @Override - public void setValueAt(Object aValue, int rowIndex, int columnIndex) { - switch (columnIndex) { - case 0: - properties.get(rowIndex).setKey((String) aValue); - break; - case 1: - properties.get(rowIndex).setValue((String) aValue); - break; - default: - throw new IllegalArgumentException(); - } - } - - @Override - public boolean isCellEditable(int rowIndex, int columnIndex) { - return true; - } - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMFacetEditorTab.java b/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMFacetEditorTab.java deleted file mode 100644 index 1ce97f712..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMFacetEditorTab.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright 2016 Alexey Andreev. - * - * 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.teavm.idea.ui; - -import com.intellij.facet.ui.FacetEditorTab; -import com.intellij.openapi.module.Module; -import javax.swing.JComponent; -import org.jetbrains.annotations.Nls; -import org.jetbrains.annotations.NotNull; -import org.teavm.idea.jps.model.TeaVMJpsConfiguration; - -public class TeaVMFacetEditorTab extends FacetEditorTab { - private TeaVMConfigurable configurable; - - public TeaVMFacetEditorTab(Module module, TeaVMJpsConfiguration configuration) { - configurable = new TeaVMConfigurable(module, configuration); - } - - @NotNull - @Override - public JComponent createComponent() { - return configurable.createComponent(); - } - - @Nls - @Override - public String getDisplayName() { - return "General settings"; - } - - @Override - public boolean isModified() { - return configurable.isModified(); - } - - @Override - public void apply() { - configurable.apply(); - } - - @Override - public void disposeUIResources() { - configurable.disposeUIResources(); - } - - @Override - public void reset() { - configurable.reset(); - } -} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMSettingsEditorTab.java b/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMSettingsEditorTab.java deleted file mode 100644 index ef8b2aafb..000000000 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/ui/TeaVMSettingsEditorTab.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright 2017 Alexey Andreev. - * - * 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.teavm.idea.ui; - -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.options.SearchableConfigurable; -import java.awt.GridBagConstraints; -import java.awt.GridBagLayout; -import java.text.DecimalFormat; -import javax.swing.JCheckBox; -import javax.swing.JComponent; -import javax.swing.JFormattedTextField; -import javax.swing.JLabel; -import javax.swing.JPanel; -import org.jetbrains.annotations.Nls; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import org.teavm.idea.TeaVMDaemonComponent; - -public class TeaVMSettingsEditorTab implements SearchableConfigurable { - private JPanel contentPane; - private JCheckBox daemonCheckBox; - private JFormattedTextField daemonMemoryField; - private JCheckBox incrementalCheckBox; - private TeaVMDaemonComponent daemonComponent; - - public TeaVMSettingsEditorTab() { - this.daemonComponent = ApplicationManager.getApplication().getComponent(TeaVMDaemonComponent.class); - - contentPane = new JPanel(); - daemonCheckBox = new JCheckBox("use build daemon (can increase performance in most cases)"); - JLabel daemonMemoryLabel = new JLabel("Daemon memory size (in megabytes): "); - daemonMemoryField = new JFormattedTextField(new DecimalFormat("#")); - incrementalCheckBox = new JCheckBox("incremental build (only available with daemon)"); - contentPane.setLayout(new GridBagLayout()); - - daemonCheckBox.addActionListener(e -> incrementalCheckBox.setEnabled(daemonCheckBox.isSelected())); - - GridBagConstraints labelConstraints = new GridBagConstraints(); - labelConstraints.gridwidth = GridBagConstraints.REMAINDER; - labelConstraints.anchor = GridBagConstraints.WEST; - labelConstraints.weightx = 1; - labelConstraints.weighty = 1; - labelConstraints.insets.left = 5; - labelConstraints.insets.right = 5; - - GridBagConstraints fieldLabelConstraints = (GridBagConstraints) labelConstraints.clone(); - fieldLabelConstraints.gridwidth = GridBagConstraints.RELATIVE; - fieldLabelConstraints.weightx = 0; - - contentPane.add(daemonCheckBox, labelConstraints); - contentPane.add(daemonMemoryLabel, fieldLabelConstraints); - contentPane.add(daemonMemoryField, labelConstraints); - contentPane.add(incrementalCheckBox, labelConstraints); - - GridBagConstraints constraints = new GridBagConstraints(); - constraints.fill = GridBagConstraints.BOTH; - constraints.weighty = 100; - constraints.weightx = 1; - contentPane.add(new JPanel(), constraints); - } - - @NotNull - @Override - public String getId() { - return "project.teavm.settings"; - } - - @Nls - @Override - public String getDisplayName() { - return "TeaVM"; - } - - @Nullable - @Override - public String getHelpTopic() { - return null; - } - - @Nullable - @Override - public JComponent createComponent() { - return contentPane; - } - - @Override - public boolean isModified() { - return daemonCheckBox.isSelected() != daemonComponent.isDaemonRunning() - || incrementalCheckBox.isSelected() != daemonComponent.isIncremental() - || ((Number) daemonMemoryField.getValue()).intValue() != daemonComponent.getDaemonMemory(); - } - - @Override - public void apply() { - boolean shouldRestartDaemon = true; - - int newDaemonMemory = ((Number) daemonMemoryField.getValue()).intValue(); - if (incrementalCheckBox.isSelected() != daemonComponent.isIncremental() - || newDaemonMemory != daemonComponent.getDaemonMemory()) { - shouldRestartDaemon = true; - } - daemonComponent.setIncremental(incrementalCheckBox.isSelected()); - daemonComponent.setDaemonMemory(newDaemonMemory); - - if (daemonCheckBox.isSelected()) { - if (!daemonComponent.isDaemonRunning()) { - daemonComponent.startDaemon(); - shouldRestartDaemon = false; - } - } else { - daemonComponent.stopDaemon(); - shouldRestartDaemon = false; - } - - if (shouldRestartDaemon) { - daemonComponent.stopDaemon(); - daemonComponent.startDaemon(); - } - - daemonComponent.applyChanges(); - } - - @Override - public void reset() { - daemonCheckBox.setSelected(daemonComponent.isDaemonRunning()); - incrementalCheckBox.setSelected(daemonComponent.isIncremental()); - daemonMemoryField.setValue(daemonComponent.getDaemonMemory()); - } -} diff --git a/tools/idea/plugin/src/main/resources/META-INF/maven.xml b/tools/idea/plugin/src/main/resources/META-INF/maven.xml deleted file mode 100644 index 745ca4122..000000000 --- a/tools/idea/plugin/src/main/resources/META-INF/maven.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/tools/idea/plugin/teavm-idea.iml b/tools/idea/plugin/teavm-idea.iml deleted file mode 100644 index 9fdf16d23..000000000 --- a/tools/idea/plugin/teavm-idea.iml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tools/idea/pom.xml b/tools/idea/pom.xml deleted file mode 100644 index 0c8334b18..000000000 --- a/tools/idea/pom.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - teavm - org.teavm - 0.7.0-SNAPSHOT - ../../pom.xml - - 4.0.0 - - teavm-idea-parent - TeaVM IDEA plugin parent - pom - - - ${basedir} - - - - - IDEA - file://${idea.artifacts.dir}/idea-artifacts/dependencies/maven - - - - - idea-artifacts - jps-common - jps-plugin - plugin - - - \ No newline at end of file diff --git a/tools/idea/settings.gradle.kts b/tools/idea/settings.gradle.kts new file mode 100644 index 000000000..6c9e76d8f --- /dev/null +++ b/tools/idea/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "teavm-idea" \ No newline at end of file diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/DaemonUtil.java b/tools/idea/src/main/java/org/teavm/idea/DaemonUtil.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/DaemonUtil.java rename to tools/idea/src/main/java/org/teavm/idea/DaemonUtil.java index 55be7bbf3..0bc56cef1 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/DaemonUtil.java +++ b/tools/idea/src/main/java/org/teavm/idea/DaemonUtil.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,7 +63,7 @@ public final class DaemonUtil { if (plugin.getPluginId().compareTo(id) == 0) { Set visited = new HashSet<>(); List classPath = new ArrayList<>(); - findInHierarchy(plugin.getPath(), classPath, visited); + findInHierarchy(plugin.getPluginPath().toFile(), classPath, visited); return classPath; } } diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/DevServerRunnerListener.java b/tools/idea/src/main/java/org/teavm/idea/DevServerRunnerListener.java similarity index 95% rename from tools/idea/plugin/src/main/java/org/teavm/idea/DevServerRunnerListener.java rename to tools/idea/src/main/java/org/teavm/idea/DevServerRunnerListener.java index 94b31fc1e..57995f491 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/DevServerRunnerListener.java +++ b/tools/idea/src/main/java/org/teavm/idea/DevServerRunnerListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMBreakpointProvider.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMBreakpointProvider.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMBreakpointProvider.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMBreakpointProvider.java index 799a45c57..276145b37 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMBreakpointProvider.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMBreakpointProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugConfiguration.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugConfiguration.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugConfiguration.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugConfiguration.java index fe5544202..515457265 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugConfiguration.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.teavm.idea.debug.ui.TeaVMDebugSettingsEditor; -public class TeaVMDebugConfiguration extends LocatableConfigurationBase +public class TeaVMDebugConfiguration extends LocatableConfigurationBase implements RunConfigurationWithSuppressedDefaultRunAction { private int port = 2357; diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugConfigurationType.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugConfigurationType.java similarity index 98% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugConfigurationType.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugConfigurationType.java index 3304e6890..e5afdc576 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugConfigurationType.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugConfigurationType.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java similarity index 95% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java index 02650afe4..9cdaa7f81 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugProcess.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,8 +20,6 @@ import com.intellij.execution.ui.ExecutionConsole; import com.intellij.icons.AllIcons; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.extensions.ExtensionPoint; -import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.util.Key; import com.intellij.xdebugger.XDebugProcess; import com.intellij.xdebugger.XDebugSession; @@ -93,8 +91,8 @@ public class TeaVMDebugProcess extends XDebugProcess { breakpointHandlers.add(new TeaVMLineBreakpointHandler<>(JavaLineBreakpointType.class, session.getProject(), innerDebugger, this)); - ExtensionPoint> breakpointProvider = Extensions.getArea( - session.getProject()).getExtensionPoint("org.teavm.extensions.breakpointProvider"); + var breakpointProvider = session.getProject().getExtensionArea() + .>getExtensionPoint("org.teavm.extensions.breakpointProvider"); if (breakpointProvider != null) { for (TeaVMBreakpointProvider provider : breakpointProvider.getExtensions()) { breakpointHandlers.add(new TeaVMLineBreakpointHandler<>(provider.getBreakpointType(), diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugRunner.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugRunner.java similarity index 98% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugRunner.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugRunner.java index 09937d2ed..f979e43e9 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebugRunner.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebugRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebuggerEditorsProvider.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebuggerEditorsProvider.java similarity index 97% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebuggerEditorsProvider.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebuggerEditorsProvider.java index b7fa87764..6039a7545 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMDebuggerEditorsProvider.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMDebuggerEditorsProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMExecutionStack.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMExecutionStack.java similarity index 98% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMExecutionStack.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMExecutionStack.java index 105c5a30a..f71ed95b0 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMExecutionStack.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMExecutionStack.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMKotlinBreakpointProvider.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMKotlinBreakpointProvider.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMKotlinBreakpointProvider.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMKotlinBreakpointProvider.java index fd6dde125..b3b784480 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMKotlinBreakpointProvider.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMKotlinBreakpointProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMLineBreakpointHandler.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMLineBreakpointHandler.java similarity index 99% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMLineBreakpointHandler.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMLineBreakpointHandler.java index 4842ce4e3..53384be65 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMLineBreakpointHandler.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMLineBreakpointHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMOriginalValue.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMOriginalValue.java similarity index 98% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMOriginalValue.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMOriginalValue.java index ff53ed65e..701b29e28 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMOriginalValue.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMOriginalValue.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMRunState.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMRunState.java similarity index 98% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMRunState.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMRunState.java index 8746f62f4..7bd0c3b6c 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMRunState.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMRunState.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMScalaBreakpointProvider.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMScalaBreakpointProvider.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMScalaBreakpointProvider.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMScalaBreakpointProvider.java index 6d14db166..ef864a349 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMScalaBreakpointProvider.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMScalaBreakpointProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMStackFrame.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMStackFrame.java similarity index 99% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMStackFrame.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMStackFrame.java index 1d6ac3053..aaedb4f71 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMStackFrame.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMStackFrame.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMSuspendContext.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMSuspendContext.java similarity index 97% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMSuspendContext.java rename to tools/idea/src/main/java/org/teavm/idea/debug/TeaVMSuspendContext.java index 8d0f1ac42..d454dd1d0 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/TeaVMSuspendContext.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMSuspendContext.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMValue.java b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMValue.java new file mode 100644 index 000000000..8a07fd40c --- /dev/null +++ b/tools/idea/src/main/java/org/teavm/idea/debug/TeaVMValue.java @@ -0,0 +1,57 @@ +/* + * Copyright 2022 Alexey Andreev. + * + * 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.teavm.idea.debug; + +import com.intellij.util.PlatformIcons; +import com.intellij.xdebugger.frame.XCompositeNode; +import com.intellij.xdebugger.frame.XNamedValue; +import com.intellij.xdebugger.frame.XValueNode; +import com.intellij.xdebugger.frame.XValuePlace; +import javax.swing.Icon; +import org.jetbrains.annotations.NotNull; +import org.teavm.debugging.Value; + +public class TeaVMValue extends XNamedValue { + private boolean root; + private Value innerValue; + + public TeaVMValue(@NotNull String name, boolean root, Value innerValue) { + super(name); + this.root = root; + this.innerValue = innerValue; + } + + @Override + public void computePresentation(@NotNull XValueNode node, @NotNull XValuePlace place) { + Icon icon = root ? PlatformIcons.VARIABLE_ICON : PlatformIcons.FIELD_ICON; + innerValue.getRepresentation() + .then(representation -> representation != null ? representation : "null") + .thenVoid(representation -> { + innerValue.getType().thenVoid(type -> { + innerValue.hasInnerStructure().then(innerStructure -> { + node.setPresentation(icon, type, representation, innerStructure); + return null; + }); + }); + }); + + } + + @Override + public void computeChildren(@NotNull XCompositeNode node) { + TeaVMStackFrame.computeChildrenImpl(node, innerValue.getProperties(), false); + } +} diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsEditor.java b/tools/idea/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsEditor.java similarity index 97% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsEditor.java rename to tools/idea/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsEditor.java index 9395784ce..b4a8d1e84 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsEditor.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsPanel.java b/tools/idea/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsPanel.java similarity index 98% rename from tools/idea/plugin/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsPanel.java rename to tools/idea/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsPanel.java index dc79ae1b2..c06de4250 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsPanel.java +++ b/tools/idea/src/main/java/org/teavm/idea/debug/ui/TeaVMDebugSettingsPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2016 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerBuildResult.java b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerBuildResult.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerBuildResult.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/DevServerBuildResult.java index 8104c7c3a..0e1c1ec24 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerBuildResult.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerBuildResult.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerConfiguration.java b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerConfiguration.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerConfiguration.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/DevServerConfiguration.java index de6eb2a7e..8f65e172b 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerConfiguration.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerInfo.java b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerInfo.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerInfo.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/DevServerInfo.java index d0cc2d6c7..2ca0118ea 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerInfo.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerInfo.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerManager.java b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerManager.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerManager.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/DevServerManager.java index 4c8df93b0..fa0953517 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerManager.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerManagerListener.java b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerManagerListener.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerManagerListener.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/DevServerManagerListener.java index 019345b6c..9c1e22bbc 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerManagerListener.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerManagerListener.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerRunner.java b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerRunner.java similarity index 99% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerRunner.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/DevServerRunner.java index fe4c46103..61f00e2b1 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/DevServerRunner.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/DevServerRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfiguration.java b/tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfiguration.java similarity index 98% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfiguration.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfiguration.java index 2323bb265..e11dd5442 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfiguration.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.teavm.idea.devserver.ui.TeaVMDevServerSettingsEditor; -public class TeaVMDevServerConfiguration extends ModuleBasedConfiguration { +public class TeaVMDevServerConfiguration extends ModuleBasedConfiguration { private String mainClass = ""; private String jdkPath; private int port = 9090; diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfigurationType.java b/tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfigurationType.java similarity index 98% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfigurationType.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfigurationType.java index 6bf72ab9e..9d1f2e827 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfigurationType.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerConfigurationType.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunState.java b/tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunState.java similarity index 96% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunState.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunState.java index 8e5fbd716..697cfba70 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunState.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunState.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import com.intellij.execution.ExecutionException; import com.intellij.execution.ExecutionResult; import com.intellij.execution.Executor; import com.intellij.execution.configurations.RunProfileState; -import com.intellij.execution.configurations.SearchScopeProvider; import com.intellij.execution.executors.DefaultDebugExecutor; import com.intellij.execution.filters.TextConsoleBuilder; import com.intellij.execution.filters.TextConsoleBuilderFactory; @@ -34,6 +33,7 @@ import com.intellij.openapi.roots.OrderEnumerator; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.search.GlobalSearchScope; +import com.intellij.psi.search.GlobalSearchScopes; import java.io.IOException; import java.net.Socket; import java.util.Arrays; @@ -53,7 +53,7 @@ public class TeaVMDevServerRunState implements RunProfileState { this.configuration = configuration; project = environment.getProject(); - GlobalSearchScope searchScope = SearchScopeProvider.createSearchScope(project, environment.getRunProfile()); + GlobalSearchScope searchScope = GlobalSearchScopes.executionScope(project, environment.getRunProfile()); consoleBuilder = TextConsoleBuilderFactory.getInstance().createBuilder(project, searchScope); } diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunner.java b/tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunner.java similarity index 99% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunner.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunner.java index fef3d2d0f..9102d415d 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunner.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMDevServerRunner.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMProcessHandler.java b/tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMProcessHandler.java similarity index 98% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMProcessHandler.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMProcessHandler.java index 87ba1ffcc..548c4c3f3 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/TeaVMProcessHandler.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/TeaVMProcessHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerConsole.java b/tools/idea/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerConsole.java similarity index 99% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerConsole.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerConsole.java index ed3c09318..b68085bbb 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerConsole.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerConsole.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsEditor.java b/tools/idea/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsEditor.java similarity index 98% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsEditor.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsEditor.java index efca85d75..a4cfb8739 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsEditor.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsEditor.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsPanel.java b/tools/idea/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsPanel.java similarity index 99% rename from tools/idea/plugin/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsPanel.java rename to tools/idea/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsPanel.java index 4e9e77489..899089b6e 100644 --- a/tools/idea/plugin/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsPanel.java +++ b/tools/idea/src/main/java/org/teavm/idea/devserver/ui/TeaVMDevServerSettingsPanel.java @@ -1,5 +1,5 @@ /* - * Copyright 2018 Alexey Andreev. + * Copyright 2022 Alexey Andreev. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/tools/idea/plugin/src/main/resources/META-INF/kotlin.xml b/tools/idea/src/main/resources/META-INF/kotlin.xml similarity index 100% rename from tools/idea/plugin/src/main/resources/META-INF/kotlin.xml rename to tools/idea/src/main/resources/META-INF/kotlin.xml diff --git a/tools/idea/plugin/src/main/resources/META-INF/plugin.xml b/tools/idea/src/main/resources/META-INF/plugin.xml similarity index 63% rename from tools/idea/plugin/src/main/resources/META-INF/plugin.xml rename to tools/idea/src/main/resources/META-INF/plugin.xml index 9a0b92839..3c2697f9a 100644 --- a/tools/idea/plugin/src/main/resources/META-INF/plugin.xml +++ b/tools/idea/src/main/resources/META-INF/plugin.xml @@ -5,7 +5,6 @@ TeaVM community com.intellij.modules.java - org.jetbrains.idea.maven org.jetbrains.kotlin org.intellij.scala @@ -17,22 +16,10 @@ ]]> - - - - - org.teavm.idea.TeaVMJPSRemoteService - - - org.teavm.idea.TeaVMDaemonComponent - - + - - - @@ -43,9 +30,6 @@ id="project.teavm.settings" displayName="TeaVM compiler" parentId="project.propCompiler"/> - - - diff --git a/tools/idea/plugin/src/main/resources/META-INF/scala.xml b/tools/idea/src/main/resources/META-INF/scala.xml similarity index 100% rename from tools/idea/plugin/src/main/resources/META-INF/scala.xml rename to tools/idea/src/main/resources/META-INF/scala.xml diff --git a/tools/idea/plugin/src/main/resources/teavm-16.png b/tools/idea/src/main/resources/teavm-16.png similarity index 100% rename from tools/idea/plugin/src/main/resources/teavm-16.png rename to tools/idea/src/main/resources/teavm-16.png diff --git a/tools/idea/teavm-idea-parent.iml b/tools/idea/teavm-idea-parent.iml deleted file mode 100644 index 4fd5057cb..000000000 --- a/tools/idea/teavm-idea-parent.iml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file