From d4fc20095aa0dd23cc6cd4247cd71ffdd62b6a6b Mon Sep 17 00:00:00 2001 From: George Herbert Date: Mon, 7 Dec 2020 18:03:51 +0000 Subject: [PATCH] 1.2.0 (#10) - Remove support for pre 2020.2 and fix the deprecation warning for 2020.3 - Tidy up FutureBuilder and StreamBuilder - Added the Gradle plugin to verify plugin without uploading to Jetbrains --- .gitignore | 3 +- build.gradle | 19 +- gradlew | 53 ++++-- gradlew.bat | 22 ++- src/main/java/FlutterContext.java | 6 +- src/main/java/FlutterTemplateProvider.java | 15 -- src/main/resources/META-INF/plugin.xml | 7 +- src/main/resources/liveTemplates/Flutter.xml | 101 +++++++--- verifier.gradle | 188 +++++++++++++++++++ 9 files changed, 345 insertions(+), 69 deletions(-) delete mode 100644 src/main/java/FlutterTemplateProvider.java create mode 100644 verifier.gradle diff --git a/.gitignore b/.gitignore index c4af730..ab582d5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ /*.dart gradle.properties .gradle/ -gradle/ \ No newline at end of file +gradle/ +build/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index eb3c194..5a26fa9 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,11 @@ plugins { id 'java' - id 'org.jetbrains.intellij' version '0.4.13' + id 'org.jetbrains.intellij' version '0.6.5' } apply plugin: 'org.jetbrains.intellij' apply plugin: 'java' apply plugin: 'idea' +apply from: "$rootDir/verifier.gradle" group 'com.herbert.george.flutter-snippets' version "$version-$releaseChannel-$iteration" @@ -25,7 +26,7 @@ sourceSets { } intellij { - plugins 'java', "Dart:$dartVersion" + plugins 'java', "Dart:$dartVersion", "io.flutter:$flutterVersion" version ideaVersion type ideaType pluginName pluginName @@ -34,7 +35,7 @@ intellij { sameSinceUntilBuild true patchPluginXml { version project.version - changeNotes "[Breaking Changes] - Read the README for changes https://github.com/georgeherby/flutter-snippets/blob/master/README.md. A overhaul to bring us in line with the VS plugin and make shortcuts consistent" + changeNotes "Remove deprecation that started in 2020.2 (stop supporting before 2020.2)" sinceBuild pluginSinceBuild } } @@ -42,4 +43,14 @@ intellij { publishPlugin { channels releaseChannel token intellijToken -} \ No newline at end of file +} + +pluginVerifier { + pluginFileName = "$rootProject.name-$version" + ides = [ + "IC-202.6397.94", + "IC-203.5981.155"] + verifierVersion = "1.253" +} + +check.dependsOn pluginVerifier \ No newline at end of file diff --git a/gradlew b/gradlew index af6708f..fbd7c51 100755 --- a/gradlew +++ b/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" @@ -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/gradlew.bat b/gradlew.bat index 6d57edc..5093609 100644 --- a/gradlew.bat +++ b/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,8 +29,11 @@ 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 @@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%* 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% diff --git a/src/main/java/FlutterContext.java b/src/main/java/FlutterContext.java index 7ce62d6..a8e0252 100644 --- a/src/main/java/FlutterContext.java +++ b/src/main/java/FlutterContext.java @@ -1,5 +1,5 @@ +import com.intellij.codeInsight.template.TemplateActionContext; import com.intellij.codeInsight.template.TemplateContextType; -import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NotNull; public class FlutterContext extends TemplateContextType { @@ -8,7 +8,7 @@ protected FlutterContext() { } @Override - public boolean isInContext(@NotNull PsiFile file, int offset) { - return file.getName().endsWith(".dart"); + public boolean isInContext(@NotNull TemplateActionContext templateActionContext) { + return templateActionContext.getFile().getName().endsWith(".dart"); } } diff --git a/src/main/java/FlutterTemplateProvider.java b/src/main/java/FlutterTemplateProvider.java deleted file mode 100644 index 60776e3..0000000 --- a/src/main/java/FlutterTemplateProvider.java +++ /dev/null @@ -1,15 +0,0 @@ -import com.intellij.codeInsight.template.impl.DefaultLiveTemplatesProvider; -import org.jetbrains.annotations.Nullable; - -public class FlutterTemplateProvider implements DefaultLiveTemplatesProvider { - @Override - public String[] getDefaultLiveTemplateFiles() { - return new String[]{"liveTemplates/Flutter"}; - } - - @Nullable - @Override - public String[] getHiddenLiveTemplateFiles() { - return new String[0]; - } -} diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 7232910..1d0cec8 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -6,10 +6,9 @@ visit here ]]> - com.intellij.modules.java - - + + - \ No newline at end of file + diff --git a/src/main/resources/liveTemplates/Flutter.xml b/src/main/resources/liveTemplates/Flutter.xml index 4c85850..6393968 100644 --- a/src/main/resources/liveTemplates/Flutter.xml +++ b/src/main/resources/liveTemplates/Flutter.xml @@ -1,17 +1,22 @@ + + + + + + + + + - + + + + + + + + + - + + + + + + + + + - + - + + + +