diff --git a/.appveyor.yml b/.appveyor.yml index f21da31..e6405b9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,7 +13,7 @@ branches: only: - main -# build on 64 bit jdk 11 +# build on 64 bit jdk 17 environment: matrix: - - JAVA_HOME: C:\Program Files\Java\jdk11 + - JAVA_HOME: C:\Program Files\Java\jdk17 diff --git a/build.gradle b/build.gradle index cbbdc7d..55b0a8a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,18 @@ // Add idea plugin version plugins { - id "java" - id "org.jetbrains.intellij" version "1.3.0" + id 'java' + id 'idea' + id 'org.jetbrains.intellij' version '1.15.0' } // Add coverage plugin apply plugin: "jacoco" +apply plugin: 'org.jetbrains.intellij' +apply plugin: 'java' // Add plugin group and version group "com.dubreuia" -version "2.4.0" +version "2.7.0" // Add build script repository to maven central repositories { @@ -18,10 +21,13 @@ repositories { // Add dependencies to test, junit5 api (annotations) and engine (runtime) dependencies { - testImplementation "org.assertj:assertj-core:3.21.0" - testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.2" - testImplementation "org.junit.jupiter:junit-jupiter-params:5.8.2" - testImplementation "org.junit.jupiter:junit-jupiter-engine:5.8.2" + testImplementation platform('org.junit:junit-bom:5.10.0'), + 'org.junit.jupiter:junit-jupiter', + 'org.junit.jupiter:junit-jupiter-engine', + 'org.assertj:assertj-core:3.24.2' + testRuntimeOnly("org.junit.platform:junit-platform-launcher") { + because("Only needed to run tests in a version of IntelliJ IDEA that bundles older versions") + } } // Add intellij task configuration for base intellij version (minimum compatibility) @@ -29,19 +35,30 @@ dependencies { // See https://www.jetbrains.com/intellij-repository/snapshots // See https://www.jetbrains.com/intellij-repository/releases intellij { - version = "2021.3" + version = "2023.2" + //version = "LATEST-EAP-SNAPSHOT" + type = "IC" plugins = ["java"] pluginName = "Save Actions" // Do not touch the plugin.xml file updateSinceUntilBuild = false } + +listProductsReleases { + sinceBuild = "231.*" +} + // JAVA compatibility compileJava { - sourceCompatibility = "11" - targetCompatibility = "11" + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } +compileJava.options.encoding = 'UTF-8' +compileJava.options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" +compileTestJava.options.encoding = 'UTF-8' + // Activate junit since gradle 4.7 test { useJUnitPlatform() @@ -59,3 +76,9 @@ jacocoTestReport { html.required = false } } + +wrapper() { + gradleVersion = '8.2.1' + distributionUrl = distributionUrl.replace('bin', 'all') +} + diff --git a/docs/badge-jetbrains-website.svg b/docs/badge-jetbrains-website.svg index bb87387..393bb1f 100644 --- a/docs/badge-jetbrains-website.svg +++ b/docs/badge-jetbrains-website.svg @@ -14,7 +14,7 @@ JetBrains Plugin JetBrains Plugin - v2.4.0 - v2.4.0 + v2.6.0 + v2.7.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 62d4c05..033e24c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e750102..c747538 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index fbd7c51..fcb6fca 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,98 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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/HEAD/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 -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -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" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +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 @@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +129,120 @@ 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. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + 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 fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -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" = "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 - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +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 - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + 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 - i=`expr $i + 1` + # 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 - 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" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -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" +# 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"' + +# 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 \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# 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/gradlew.bat b/gradlew.bat index a9f778a..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -54,7 +55,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% @@ -64,21 +65,6 @@ 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 @@ -86,17 +72,19 @@ 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 -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 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 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/com/dubreuia/core/component/Engine.java b/src/main/java/com/dubreuia/core/component/Engine.java index 240028c..62c57e9 100644 --- a/src/main/java/com/dubreuia/core/component/Engine.java +++ b/src/main/java/com/dubreuia/core/component/Engine.java @@ -34,8 +34,11 @@ import com.dubreuia.processors.ResultCode; import com.dubreuia.processors.SaveCommand; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.editor.Document; +import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectRootManager; +import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.util.PsiErrorElementUtil; import org.jetbrains.annotations.NotNull; @@ -108,6 +111,10 @@ private void processPsiFiles(Project project, Set psiFiles, ExecutionMo .filter(command -> command.getModes().contains(mode)) .collect(toList()); LOGGER.info(String.format("Filtered processors %s", processorsEligible)); + if (!processorsEligible.isEmpty()) { + PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project); + psiFiles.forEach(psiFile -> commitDocumentAndSave(psiFile, psiDocumentManager)); + } List>> results = processorsEligible.stream() .filter(Objects::nonNull) .peek(command -> LOGGER.info(String.format("Execute command %s on %d files", command, psiFiles.size()))) @@ -223,4 +230,18 @@ private boolean atLeastOneMatch(String psiFileUrl, Set patterns) { return false; } + /** + * Should properly fix #402 according to @krasa's recommendation in #109. + * + * @param psiFile of type PsiFile + * @param psiDocumentManager + */ + private void commitDocumentAndSave(PsiFile psiFile, PsiDocumentManager psiDocumentManager) { + Document document = psiDocumentManager.getDocument(psiFile); + if (document != null) { + psiDocumentManager.doPostponedOperationsAndUnblockDocument(document); + psiDocumentManager.commitDocument(document); + FileDocumentManager.getInstance().saveDocument(document); + } + } } diff --git a/src/main/java/com/dubreuia/core/listener/SaveActionsDocumentManagerListener.java b/src/main/java/com/dubreuia/core/listener/SaveActionsDocumentManagerListener.java index 78be912..c2f5358 100644 --- a/src/main/java/com/dubreuia/core/listener/SaveActionsDocumentManagerListener.java +++ b/src/main/java/com/dubreuia/core/listener/SaveActionsDocumentManagerListener.java @@ -47,16 +47,15 @@ /** * FileDocumentManagerListener to catch save events. This listener is registered as ExtensionPoint. */ -public class SaveActionsDocumentManagerListener implements FileDocumentManagerListener { +public final class SaveActionsDocumentManagerListener implements FileDocumentManagerListener { private static final Logger LOGGER = Logger.getInstance(SaveActionsService.class); private final Project project; - private final PsiDocumentManager psiDocumentManager; + private PsiDocumentManager psiDocumentManager = null; public SaveActionsDocumentManagerListener(Project project) { this.project = project; - psiDocumentManager = PsiDocumentManager.getInstance(project); } @Override @@ -74,6 +73,7 @@ public void beforeDocumentsSaving(List documents) { if (project.isDisposed()) { return; } + initPsiDocManager(); Set psiFiles = documents.stream() .map(psiDocumentManager::getPsiFile) .filter(Objects::nonNull) @@ -81,4 +81,10 @@ public void beforeDocumentsSaving(List documents) { SaveActionsServiceManager.getService().guardedProcessPsiFiles(project, psiFiles, activate, saveAll); } + private synchronized void initPsiDocManager() { + if (psiDocumentManager == null) { + psiDocumentManager = PsiDocumentManager.getInstance(project); + } + } + } diff --git a/src/main/java/com/dubreuia/model/Storage.java b/src/main/java/com/dubreuia/model/Storage.java index 7036f36..6314f32 100644 --- a/src/main/java/com/dubreuia/model/Storage.java +++ b/src/main/java/com/dubreuia/model/Storage.java @@ -26,6 +26,7 @@ package com.dubreuia.model; import com.intellij.openapi.components.PersistentStateComponent; +import com.intellij.openapi.components.Service; import com.intellij.openapi.components.State; import com.intellij.serviceContainer.NonInjectable; import com.intellij.util.xmlb.XmlSerializerUtil; @@ -37,7 +38,8 @@ import java.util.Set; @State(name = "SaveActionSettings", storages = {@com.intellij.openapi.components.Storage("saveactions_settings.xml")}) -public class Storage implements PersistentStateComponent { +@Service(Service.Level.PROJECT) +public final class Storage implements PersistentStateComponent { private boolean firstLaunch; private Set actions; @@ -46,8 +48,6 @@ public class Storage implements PersistentStateComponent { private String configurationPath; private List quickLists; - // Tested in 2018.3, seems like it works anyway - @SuppressWarnings("MissingRecentApi") @NonInjectable public Storage() { firstLaunch = true; @@ -57,9 +57,7 @@ public Storage() { configurationPath = null; quickLists = new ArrayList<>(); } - - // Tested in 2018.3, seems like it works anyway - @SuppressWarnings("MissingRecentApi") + @NonInjectable public Storage(Storage storage) { firstLaunch = storage.firstLaunch; diff --git a/src/main/java/com/dubreuia/processors/GlobalProcessor.java b/src/main/java/com/dubreuia/processors/GlobalProcessor.java index 61b37e1..f70e1ae 100644 --- a/src/main/java/com/dubreuia/processors/GlobalProcessor.java +++ b/src/main/java/com/dubreuia/processors/GlobalProcessor.java @@ -33,6 +33,7 @@ import com.intellij.codeInsight.actions.ReformatCodeProcessor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; +import org.jetbrains.annotations.NotNull; import java.util.Arrays; import java.util.EnumSet; @@ -47,20 +48,33 @@ */ public enum GlobalProcessor implements Processor { - organizeImports(Action.organizeImports, - (project, psiFiles) -> new OptimizeImportsProcessor(project, psiFiles, null)::run), + organizeImports(Action.organizeImports, GlobalProcessor::optimizeImports), reformat(Action.reformat, - (project, psiFiles) -> new ReformatCodeProcessor(project, psiFiles, null, false)::run), + (project, psiFiles) -> reformateCode(project, psiFiles, false)), reformatChangedCode(Action.reformatChangedCode, - (project, psiFiles) -> new ReformatCodeProcessor(project, psiFiles, null, true)::run), + (project, psiFiles) -> reformateCode(project, psiFiles, true)), - rearrange(Action.rearrange, - (project, psiFiles) -> new RearrangeCodeProcessor(project, psiFiles, CodeInsightBundle.message("command.rearrange.code"), null)::run), + rearrange(Action.rearrange, GlobalProcessor::rearrangeCode), ; + @NotNull + private static Runnable rearrangeCode(Project project, PsiFile[] psiFiles) { + return new RearrangeCodeProcessor(project, psiFiles, CodeInsightBundle.message("command.rearrange.code"), null)::run; + } + + @NotNull + private static Runnable optimizeImports(Project project, PsiFile[] psiFiles) { + return new OptimizeImportsProcessor(project, psiFiles, null)::run; + } + + @NotNull + private static Runnable reformateCode(Project project, PsiFile[] psiFiles, boolean processChangedTextOnly) { + return new ReformatCodeProcessor(project, psiFiles, null, processChangedTextOnly)::run; + } + private final Action action; private final BiFunction command; diff --git a/src/main/java/com/dubreuia/processors/Result.java b/src/main/java/com/dubreuia/processors/Result.java index 5d6e4ea..0e42de9 100644 --- a/src/main/java/com/dubreuia/processors/Result.java +++ b/src/main/java/com/dubreuia/processors/Result.java @@ -36,10 +36,6 @@ public class Result { this.result = result; } - Result(com.intellij.openapi.application.RunResult result) { - this.result = result.getResultObject(); - } - public T getResult() { return result; } diff --git a/src/main/java/com/dubreuia/processors/ResultCode.java b/src/main/java/com/dubreuia/processors/ResultCode.java index 8e2e857..08c9204 100644 --- a/src/main/java/com/dubreuia/processors/ResultCode.java +++ b/src/main/java/com/dubreuia/processors/ResultCode.java @@ -30,6 +30,7 @@ */ public enum ResultCode { - OK + OK, + FAILED } diff --git a/src/main/java/com/dubreuia/processors/SaveReadCommand.java b/src/main/java/com/dubreuia/processors/SaveReadCommand.java index 777ac82..d64ffd5 100644 --- a/src/main/java/com/dubreuia/processors/SaveReadCommand.java +++ b/src/main/java/com/dubreuia/processors/SaveReadCommand.java @@ -33,6 +33,7 @@ import java.util.Set; import java.util.function.BiFunction; +import static com.dubreuia.processors.ResultCode.FAILED; import static com.dubreuia.processors.ResultCode.OK; /** @@ -41,17 +42,20 @@ public class SaveReadCommand extends SaveCommand { public SaveReadCommand( - Project project, Set psiFiles, Set modes, Action action, - BiFunction command) { + Project project, Set psiFiles, Set modes, Action action, + BiFunction command) { super(project, psiFiles, modes, action, command); } @Override - public Result execute() { - - getCommand().apply(getProject(), getPsiFilesAsArray()).run(); - return new Result<>(OK); + public synchronized Result execute() { + try { + getCommand().apply(getProject(), getPsiFilesAsArray()).run(); + return new Result<>(OK); + } catch (Exception e) { + return new Result<>(FAILED); + } } } diff --git a/src/main/java/com/dubreuia/processors/SaveWriteCommand.java b/src/main/java/com/dubreuia/processors/SaveWriteCommand.java index 4b585a8..79a847a 100644 --- a/src/main/java/com/dubreuia/processors/SaveWriteCommand.java +++ b/src/main/java/com/dubreuia/processors/SaveWriteCommand.java @@ -34,6 +34,7 @@ import java.util.Set; import java.util.function.BiFunction; +import static com.dubreuia.processors.ResultCode.FAILED; import static com.dubreuia.processors.ResultCode.OK; /** @@ -48,11 +49,13 @@ public SaveWriteCommand(Project project, Set psiFiles, Set execute() { - WriteCommandAction.writeCommandAction(getProject(), getPsiFilesAsArray()) - .run(() -> getCommand().apply(getProject(), getPsiFilesAsArray()).run()); - - return new Result<>(OK); + public synchronized Result execute() { + try { + WriteCommandAction.writeCommandAction(getProject(), getPsiFilesAsArray()) + .run(() -> getCommand().apply(getProject(), getPsiFilesAsArray()).run()); + return new Result<>(OK); + } catch (Exception e) { + return new Result<>(FAILED); + } } - } diff --git a/src/main/java/com/dubreuia/processors/java/InspectionRunnable.java b/src/main/java/com/dubreuia/processors/java/InspectionRunnable.java index 9a473a7..5a3a91c 100644 --- a/src/main/java/com/dubreuia/processors/java/InspectionRunnable.java +++ b/src/main/java/com/dubreuia/processors/java/InspectionRunnable.java @@ -29,6 +29,7 @@ import com.intellij.codeInspection.GlobalInspectionContext; import com.intellij.codeInspection.InspectionEngine; import com.intellij.codeInspection.InspectionManager; +import com.intellij.codeInspection.LocalInspectionEP; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.QuickFix; @@ -39,7 +40,6 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiFile; -import java.io.Serializable; import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -50,14 +50,13 @@ /** * Implements a runnable for inspections commands. */ -class InspectionRunnable implements Runnable, Serializable { +class InspectionRunnable implements Runnable { private static final Logger LOGGER = Logger.getInstance(SaveActionsService.class); - private static final long serialVersionUID = -9189508316598162392L; private final Project project; private final Set psiFiles; - private final InspectionToolWrapper toolWrapper; + private final InspectionToolWrapper toolWrapper; InspectionRunnable(Project project, Set psiFiles, LocalInspectionTool inspectionTool) { this.project = project; @@ -79,7 +78,7 @@ private List getProblemDescriptors( try { return InspectionEngine.runInspectionOnFile(psiFile, toolWrapper, context); } catch (IndexNotReadyException exception) { - LOGGER.error(String.format("Cannot inspect file %s: index not ready (%s)", + LOGGER.info(String.format("Cannot inspect file %s: index not ready (%s)", psiFile.getName(), exception.getMessage())); return Collections.emptyList(); diff --git a/src/main/java/com/dubreuia/processors/java/inspection/CustomSerializableHasSerialVersionUidFieldInspection.java b/src/main/java/com/dubreuia/processors/java/inspection/CustomSerializableHasSerialVersionUidFieldInspection.java index 15e9edb..2a4facc 100644 --- a/src/main/java/com/dubreuia/processors/java/inspection/CustomSerializableHasSerialVersionUidFieldInspection.java +++ b/src/main/java/com/dubreuia/processors/java/inspection/CustomSerializableHasSerialVersionUidFieldInspection.java @@ -4,6 +4,7 @@ import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.codeInspection.SerializableHasSerialVersionUidFieldInspection; import com.intellij.codeInspection.USerializableInspectionBase; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -19,6 +20,7 @@ public class CustomSerializableHasSerialVersionUidFieldInspection extends USerializableInspectionBase { + @SuppressWarnings("unchecked") public CustomSerializableHasSerialVersionUidFieldInspection() { super(new Class[]{UClass.class}); } @@ -28,6 +30,18 @@ public CustomSerializableHasSerialVersionUidFieldInspection() { return "serial"; } + @Override + public @Nls(capitalization = Nls.Capitalization.Sentence) @NotNull String getDisplayName() { + + return this.getClass().getSimpleName(); + } + + @Override + public @Nls(capitalization = Nls.Capitalization.Sentence) @NotNull String getGroupDisplayName() { + + return "SaveActionsInternal"; + } + @Override public ProblemDescriptor @Nullable [] checkClass(@NotNull UClass aClass, @NotNull InspectionManager manager, boolean isOnTheFly) { SerializableHasSerialVersionUidFieldInspection inspection = new SerializableHasSerialVersionUidFieldInspection(); diff --git a/src/main/java/com/siyeh/ig/style/CustomUnqualifiedStaticUsageInspection.java b/src/main/java/com/siyeh/ig/style/CustomUnqualifiedStaticUsageInspection.java index af95bdd..fad52ab 100644 --- a/src/main/java/com/siyeh/ig/style/CustomUnqualifiedStaticUsageInspection.java +++ b/src/main/java/com/siyeh/ig/style/CustomUnqualifiedStaticUsageInspection.java @@ -25,8 +25,6 @@ package com.siyeh.ig.style; -import org.jetbrains.annotations.NotNull; - import com.intellij.psi.JavaResolveResult; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; @@ -43,6 +41,8 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.siyeh.ig.BaseInspectionVisitor; +import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NotNull; /** * Copy pasting because: cannot extend. Do not reformat (useful for diffs) @@ -51,89 +51,104 @@ */ public class CustomUnqualifiedStaticUsageInspection extends UnqualifiedStaticUsageInspection { + @Override + public @Nls(capitalization = Nls.Capitalization.Sentence) @NotNull String getDisplayName() { + + return this.getClass().getSimpleName(); + } + + + @Override + public BaseInspectionVisitor buildVisitor() { + + return new CustomUnqualifiedStaticCallVisitor(); + } + + + private class CustomUnqualifiedStaticCallVisitor extends BaseInspectionVisitor { + @Override - public BaseInspectionVisitor buildVisitor() { - return new CustomUnqualifiedStaticCallVisitor(); - } + public void visitMethodCallExpression( + @NotNull final PsiMethodCallExpression expression) { - private class CustomUnqualifiedStaticCallVisitor extends BaseInspectionVisitor { - @Override - public void visitMethodCallExpression( - @NotNull PsiMethodCallExpression expression) { - super.visitMethodCallExpression(expression); - if (m_ignoreStaticMethodCalls) { - return; - } - final PsiReferenceExpression methodExpression = + super.visitMethodCallExpression(expression); + if (m_ignoreStaticMethodCalls) { + return; + } + final PsiReferenceExpression methodExpression = expression.getMethodExpression(); - if (!isUnqualifiedStaticAccess(methodExpression)) { - return; - } - registerError(methodExpression, expression); + if (!isUnqualifiedStaticAccess(methodExpression)) { + return; } + registerError(methodExpression, expression); + } - @Override - public void visitReferenceExpression( - @NotNull PsiReferenceExpression expression) { - super.visitReferenceExpression(expression); - if (m_ignoreStaticFieldAccesses) { - return; - } - final PsiElement element = expression.resolve(); - if (!(element instanceof PsiField)) { - return; - } - final PsiField field = (PsiField)element; - if (field.hasModifierProperty(PsiModifier.FINAL) && - PsiUtil.isOnAssignmentLeftHand(expression)) { - return; - } - if (!isUnqualifiedStaticAccess(expression)) { - return; - } - registerError(expression, expression); + + @Override + public void visitReferenceExpression( + @NotNull final PsiReferenceExpression expression) { + + super.visitReferenceExpression(expression); + if (m_ignoreStaticFieldAccesses) { + return; } + final PsiElement element = expression.resolve(); + if (!(element instanceof PsiField)) { + return; + } + final PsiField field = (PsiField) element; + if (field.hasModifierProperty(PsiModifier.FINAL) && + PsiUtil.isOnAssignmentLeftHand(expression)) { + return; + } + if (!isUnqualifiedStaticAccess(expression)) { + return; + } + registerError(expression, expression); + } + + + private boolean isUnqualifiedStaticAccess( + final PsiReferenceExpression expression) { - private boolean isUnqualifiedStaticAccess( - PsiReferenceExpression expression) { - if (m_ignoreStaticAccessFromStaticContext) { - final PsiMember member = + if (m_ignoreStaticAccessFromStaticContext) { + final PsiMember member = PsiTreeUtil.getParentOfType(expression, - PsiMember.class); - if (member != null && - member.hasModifierProperty(PsiModifier.STATIC)) { - return false; - } - } - final PsiExpression qualifierExpression = - expression.getQualifierExpression(); - if (qualifierExpression != null) { + PsiMember.class); + if (member != null && + member.hasModifierProperty(PsiModifier.STATIC)) { return false; } - final JavaResolveResult resolveResult = + } + final PsiExpression qualifierExpression = + expression.getQualifierExpression(); + if (qualifierExpression != null) { + return false; + } + final JavaResolveResult resolveResult = expression.advancedResolve(false); - final PsiElement currentFileResolveScope = + final PsiElement currentFileResolveScope = resolveResult.getCurrentFileResolveScope(); - if (currentFileResolveScope instanceof PsiImportStaticStatement) { - return false; - } - final PsiElement element = resolveResult.getElement(); - if (!(element instanceof PsiField) && - !(element instanceof PsiMethod)) { - return false; - } - final PsiMember member = (PsiMember)element; - if (member instanceof PsiEnumConstant && - expression.getParent() instanceof PsiSwitchLabelStatement) { - return false; - } - PsiClass expressionClass = PsiTreeUtil.getParentOfType(expression, PsiClass.class); - PsiClass memberClass = member.getContainingClass(); - if (memberClass != null && memberClass.equals(expressionClass)) { - return false; - } - return member.hasModifierProperty(PsiModifier.STATIC); + if (currentFileResolveScope instanceof PsiImportStaticStatement) { + return false; + } + final PsiElement element = resolveResult.getElement(); + if (!(element instanceof PsiField) && + !(element instanceof PsiMethod)) { + return false; + } + final PsiMember member = (PsiMember) element; + if (member instanceof PsiEnumConstant && + expression.getParent() instanceof PsiSwitchLabelStatement) { + return false; + } + final PsiClass expressionClass = PsiTreeUtil.getParentOfType(expression, PsiClass.class); + final PsiClass memberClass = member.getContainingClass(); + if (memberClass != null && memberClass.equals(expressionClass)) { + return false; } + return member.hasModifierProperty(PsiModifier.STATIC); } + } -} \ No newline at end of file +} diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 4bedc80..ba7234b 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -4,7 +4,7 @@ com.dubreuia Save Actions - 2.4.0 + 2.6.0 Alexandre DuBreuil -
  • Release notes: https://github.com/dubreuia/intellij-plugin-save-actions/releases/tag/v2.4.0
    • +
  • Release notes: https://github.com/dubreuia/intellij-plugin-save-actions/releases/tag/v2.5.0
    • ]]> - + com.intellij.modules.java @@ -66,8 +66,7 @@ - - + diff --git a/src/test/java/com/dubreuia/integration/IntegrationTest.java b/src/test/java/com/dubreuia/integration/IntegrationTest.java index 10b665e..fe5ad64 100644 --- a/src/test/java/com/dubreuia/integration/IntegrationTest.java +++ b/src/test/java/com/dubreuia/integration/IntegrationTest.java @@ -33,8 +33,8 @@ import com.intellij.testFramework.fixtures.impl.LightTempDirTestFixtureImpl; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.TestInfo; -import java.io.File; import java.nio.file.Path; import java.nio.file.Paths; @@ -51,9 +51,9 @@ public abstract class IntegrationTest { Storage storage; @BeforeEach - public void before() throws Exception { + public void before(TestInfo testInfo) throws Exception { IdeaTestFixtureFactory factory = IdeaTestFixtureFactory.getFixtureFactory(); - IdeaProjectTestFixture testFixture = factory.createLightFixtureBuilder(EMPTY_PROJECT_DESCRIPTOR).getFixture(); + IdeaProjectTestFixture testFixture = factory.createLightFixtureBuilder(EMPTY_PROJECT_DESCRIPTOR, testInfo.getDisplayName()).getFixture(); fixture = factory.createCodeInsightFixture(testFixture, new LightTempDirTestFixtureImpl(true)); fixture.setUp(); fixture.setTestDataPath(getTestDataPath()); @@ -85,9 +85,8 @@ void assertSaveActionBatch(ActionTestFile before, ActionTestFile after) { } private String getTestDataPath() { - Path classes = Paths.get(new File(getClass().getProtectionDomain().getCodeSource().getLocation().getPath()) - .getAbsolutePath()); - Path resources = Paths.get(classes.getParent().toString(), "resources"); + /* See gradle config. Previous implementation not compatible with intellij gradle plugin >= 1.6.0 */ + Path resources = Paths.get("./build/classes/java/resources"); Path root = Paths.get(resources.toString(), getClass().getPackage().getName().split("[.]")); return root.toString(); }