diff --git a/de.peeeq.wurstscript/build.gradle b/de.peeeq.wurstscript/build.gradle index 97f0b21d1..1bf7b0108 100644 --- a/de.peeeq.wurstscript/build.gradle +++ b/de.peeeq.wurstscript/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - jcenter() + mavenCentral() } dependencies { classpath 'de.undercouch:gradle-download-task:3.2.0' @@ -21,7 +21,6 @@ plugins { import de.undercouch.gradle.tasks.download.Download import org.eclipse.jgit.api.Git -import org.eclipse.jgit.internal.storage.file.FileRepository import org.eclipse.jgit.lib.Constants import org.eclipse.jgit.lib.ObjectId @@ -60,12 +59,8 @@ String genDir = "$projectDir/src-gen" sourceSets { main { java { - srcDir 'src/main/java' srcDir genDir } - resources { - srcDir 'src/main/resources' - } } } @@ -73,7 +68,6 @@ repositories { mavenLocal() mavenCentral() maven { url 'https://jitpack.io' } - jcenter() } dependencies { @@ -85,44 +79,44 @@ dependencies { compileOnly 'com.github.peterzeller:abstractsyntaxgen:ef7fec791a' // JUnit for testing - testCompile group: 'org.testng', name: 'testng', version: '6.14.3' - testCompile group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3' + testImplementation group: 'org.testng', name: 'testng', version: '6.14.3' + testImplementation group: 'org.hamcrest', name: 'hamcrest-all', version: '1.3' // Google guava - compile 'com.google.guava:guava:30.0-jre' + implementation 'com.google.guava:guava:30.0-jre' // Better functional data structures: - compile 'io.vavr:vavr:1.0.0-alpha-3' + implementation 'io.vavr:vavr:1.0.0-alpha-3' // Support for the vscode language server protocol - compile group: 'org.eclipse.lsp4j', name: 'org.eclipse.lsp4j', version: '0.10.0' + implementation group: 'org.eclipse.lsp4j', name: 'org.eclipse.lsp4j', version: '0.10.0' // @Nullable annotations - compile group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version: '2.1.0' + implementation group: 'org.eclipse.jdt', name: 'org.eclipse.jdt.annotation', version: '2.1.0' // Gson for json parsing - compile group: 'com.google.code.gson', name: 'gson', version: '2.8.5' + implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5' // Velocity template engine for generating Html documents from Hotdoc documentation - compile group: 'org.apache.velocity', name: 'velocity', version: '1.7' + implementation group: 'org.apache.velocity', name: 'velocity', version: '1.7' // Chardet for guessing the file-encoding of a source-file - compile group: 'net.sourceforge.jchardet', name: 'jchardet', version: '1.0' + implementation group: 'net.sourceforge.jchardet', name: 'jchardet', version: '1.0' // Crigges' jmpq - compile 'com.github.inwc3:jmpq3:0aaca2373d' + implementation 'com.github.inwc3:jmpq3:0aaca2373d' // Water's wc3 libs - compile 'com.github.inwc3:wc3libs:7ece74aecc' + implementation 'com.github.inwc3:wc3libs:7ece74aecc' // The setup tool for wurst.build handling - compile 'com.github.wurstscript:wurstsetup:4c65824b40' + implementation 'com.github.wurstscript:wurstsetup:4c65824b40' - compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' - compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' + implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25' + implementation group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3' // Smallcheck testing library: - testCompile group: 'com.github.peterzeller', name: 'java-smallcheck', version: '3f6a178ba7' + testImplementation group: 'com.github.peterzeller', name: 'java-smallcheck', version: '3f6a178ba7' } configurations.all { @@ -133,13 +127,13 @@ configurations.all { task genAst { description = 'Compile ast specifications' fileTree(dir: 'parserspec', include: '**/*.parseq').each { file -> - Pattern PACKAGE_PATTERN = Pattern.compile("package\\s+(\\S+)\\s*;"); + Pattern PACKAGE_PATTERN = Pattern.compile("package\\s+(\\S+)\\s*;") String fileContents = file.text - Matcher matcher = PACKAGE_PATTERN.matcher(fileContents); - String packageName = ""; + Matcher matcher = PACKAGE_PATTERN.matcher(fileContents) + String packageName = "" if (matcher.find()) { - packageName = matcher.group(1); + packageName = matcher.group(1) } String targetDir = "$genDir/" + packageName.replace(".", "/") @@ -149,7 +143,7 @@ task genAst { doLast { javaexec { - classpath configurations.compileOnly + classpath configurations.compileClasspath main = "asg.Main" args = [file, targetDir] } diff --git a/de.peeeq.wurstscript/deploy.gradle b/de.peeeq.wurstscript/deploy.gradle index dbd1c06f2..a8a5aea89 100644 --- a/de.peeeq.wurstscript/deploy.gradle +++ b/de.peeeq.wurstscript/deploy.gradle @@ -5,7 +5,7 @@ jar { version = null manifest { attributes( - 'Class-Path': configurations.compile.collect { it.getName() }.join(' '), + 'Class-Path': configurations.compileClasspath.collect { it.getName() }.join(' '), 'Main-Class': mainClassName ) } diff --git a/de.peeeq.wurstscript/gradle/wrapper/gradle-wrapper.jar b/de.peeeq.wurstscript/gradle/wrapper/gradle-wrapper.jar index 457aad0d9..7454180f2 100644 Binary files a/de.peeeq.wurstscript/gradle/wrapper/gradle-wrapper.jar and b/de.peeeq.wurstscript/gradle/wrapper/gradle-wrapper.jar differ diff --git a/de.peeeq.wurstscript/gradle/wrapper/gradle-wrapper.properties b/de.peeeq.wurstscript/gradle/wrapper/gradle-wrapper.properties index 14e30f741..05679dc3c 100644 --- a/de.peeeq.wurstscript/gradle/wrapper/gradle-wrapper.properties +++ b/de.peeeq.wurstscript/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/de.peeeq.wurstscript/gradlew b/de.peeeq.wurstscript/gradlew index af6708ff2..744e882ed 100755 --- a/de.peeeq.wurstscript/gradlew +++ b/de.peeeq.wurstscript/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or 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 UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$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"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -56,7 +72,7 @@ case "`uname`" in Darwin* ) darwin=true ;; - MINGW* ) + MSYS* | MINGW* ) msys=true ;; NONSTOP* ) @@ -66,6 +82,7 @@ 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 @@ -109,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -138,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -159,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/de.peeeq.wurstscript/gradlew.bat b/de.peeeq.wurstscript/gradlew.bat index 0f8d5937c..ac1b06f93 100644 --- a/de.peeeq.wurstscript/gradlew.bat +++ b/de.peeeq.wurstscript/gradlew.bat @@ -1,3 +1,19 @@ +@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 @@ -13,15 +29,18 @@ 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" +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 init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :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 %CMD_LINE_ARGS% +"%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 diff --git a/de.peeeq.wurstscript/parserspec/wurstscript.parseq b/de.peeeq.wurstscript/parserspec/wurstscript.parseq index 2aaab52eb..434905784 100644 --- a/de.peeeq.wurstscript/parserspec/wurstscript.parseq +++ b/de.peeeq.wurstscript/parserspec/wurstscript.parseq @@ -848,7 +848,7 @@ VarDef.attrOptTypeExpr() returns OptTypeExpr implemented by de.peeeq.wurstscript.attributes.names.VarLink.getTypeExpr -ModuleUse.attrModuleDef +ModuleUse.calculateModuleDef() returns @Nullable ModuleDef implemented by de.peeeq.wurstscript.attributes.AttrModuleDef.calculate diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/GetDefinition.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/GetDefinition.java index 8b7222020..05235ab0a 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/GetDefinition.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/GetDefinition.java @@ -70,7 +70,7 @@ private List execute2(ModelManager modelManager) { return linkTo(def); } else if (e instanceof ModuleUse) { ModuleUse use = (ModuleUse) e; - ModuleDef def = use.attrModuleDef(); + ModuleDef def = use.calculateModuleDef(); return linkTo(def); } else if (e instanceof ExprBinary) { ExprBinary eb = (ExprBinary) e; diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/HoverInfo.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/HoverInfo.java index 21bba922e..c7d8fcb1a 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/HoverInfo.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/requests/HoverInfo.java @@ -439,7 +439,7 @@ public List> case_NoTypeExpr(NoTypeExpr noTypeExpr) @Override public List> case_ModuleUse(ModuleUse moduleUse) { - return description(moduleUse.attrModuleDef()); + return description(moduleUse.calculateModuleDef()); } diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/ModuleExpander.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/ModuleExpander.java index 5a454984d..d003690f2 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/ModuleExpander.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/ModuleExpander.java @@ -51,7 +51,7 @@ public static ModuleInstanciations expandModules(ClassOrModule m, Collection calculate(ClassOrModule c) { ImmutableCollection.Builder result = ImmutableList.builder(); for (ModuleUse moduleUse : c.getModuleUses()) { - ModuleDef usedModule = moduleUse.attrModuleDef(); + ModuleDef usedModule = moduleUse.calculateModuleDef(); if (usedModule != null) { result.add(usedModule); } diff --git a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/DescriptionHtml.java b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/DescriptionHtml.java index 07041b397..97840337f 100644 --- a/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/DescriptionHtml.java +++ b/de.peeeq.wurstscript/src/main/java/de/peeeq/wurstscript/attributes/DescriptionHtml.java @@ -247,7 +247,7 @@ public static String description(ModStatic modStatic) { } public static String description(ModuleUse m) { - return m.attrModuleDef().descriptionHtml(); + return m.calculateModuleDef().descriptionHtml(); } public static @Nullable String description(NoDefaultCase noDefaultCase) {