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 000000000..249e5832f Binary files /dev/null and b/tools/idea/gradle/wrapper/gradle-wrapper.jar differ diff --git a/tools/idea/gradle/wrapper/gradle-wrapper.properties b/tools/idea/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..ae04661ee --- /dev/null +++ b/tools/idea/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/tools/idea/gradlew b/tools/idea/gradlew new file mode 100755 index 000000000..1b6c78733 --- /dev/null +++ b/tools/idea/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + 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