diff --git a/.intellijPlatform/self-update.lock b/.intellijPlatform/self-update.lock index b2ad95e..567ce95 100644 --- a/.intellijPlatform/self-update.lock +++ b/.intellijPlatform/self-update.lock @@ -1 +1 @@ -2025-06-29 \ No newline at end of file +2026-02-05 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 3d05cda..29cab5c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,57 +1,117 @@ import org.jetbrains.grammarkit.tasks.GenerateLexerTask +import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType +import org.jetbrains.intellij.platform.gradle.models.ProductRelease plugins { id 'java' - id 'org.jetbrains.intellij' version '1.17.4' - id 'org.jetbrains.grammarkit' version '2021.2.1' + id 'org.jetbrains.intellij.platform' version '2.11.0' + id 'org.jetbrains.grammarkit' version '2023.3.0.1' } -group 'xmonader' -version '2.0' +group = 'xmonader' +version = '3.0' java { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } repositories { mavenCentral() + intellijPlatform { + defaultRepositories() + } } dependencies { testImplementation 'junit:junit:4.13.2' + intellijPlatform { + intellijIdea "2025.3.2" + } } -intellij { - version.set('2022.1.4') - type.set('IC') -} +intellijPlatform { + buildSearchableOptions = true + instrumentCode = true + projectName = "SerCapnp" + + //this is used internally by the intelij platform plugin, we can safely ignore groovy not understanding it + //noinspection GroovyAssignabilityCheck + pluginConfiguration { + id = "com.sercapnp" + name = "SerCapnp" + description = "Adds Capnp Support for Intellij-based IDEs (https://capnproto.org/)" + changeNotes = """ + + """.stripIndent(true) + + ideaVersion { + sinceBuild.set("221") + } + + vendor { + name = "xmonader" + email = "xmonader@gmail.com" + url = "https://github.com/xmonader" + } + + } + + //this is used internally by the intelij platform plugin, we can safely ignore groovy not understanding it + //noinspection GroovyAssignabilityCheck + pluginVerification { + ides { + select { + it.types = [IntelliJPlatformType.AndroidStudio, + IntelliJPlatformType.CLion, + IntelliJPlatformType.DataGrip, + IntelliJPlatformType.DataSpell, + IntelliJPlatformType.FleetBackend, + IntelliJPlatformType.Gateway, + IntelliJPlatformType.GoLand, + IntelliJPlatformType.JetBrainsClient, + IntelliJPlatformType.RubyMine, + IntelliJPlatformType.RustRover, + IntelliJPlatformType.PhpStorm, + IntelliJPlatformType.Writerside, + IntelliJPlatformType.WebStorm] + it.channels = [ProductRelease.Channel.RELEASE] + it.sinceBuild = '242' + } + select { + it.types = [IntelliJPlatformType.IntellijIdeaCommunity, + IntelliJPlatformType.IntellijIdeaUltimate, + IntelliJPlatformType.PyCharmCommunity, + IntelliJPlatformType.PyCharmCommunity] + it.channels = [ProductRelease.Channel.RELEASE] + it.sinceBuild = '242' + it.untilBuild = '252' + } + select { + it.types = [IntelliJPlatformType.IntellijIdea, + IntelliJPlatformType.PyCharm] + it.channels = [ProductRelease.Channel.RELEASE] + it.sinceBuild = '252' + } + } + } -patchPluginXml { - sinceBuild.set('221') - untilBuild.set('') - changeNotes.set(""" - - """) } -tasks.withType(JavaCompile) { +tasks.withType(JavaCompile).configureEach { options.encoding = 'UTF-8' } -task cleanLexer(type: Delete) { +tasks.register('cleanLexer', Delete) { delete file('build/generated-src/com/sercapnp/lang/CapnpLexer.java') } tasks.named('generateLexer', GenerateLexerTask).configure { task -> - task.source = 'src/main/java/com/sercapnp/lang/Capnp.flex' - task.targetDir = 'build/generated-src/com/sercapnp/lang' - task.targetClass = 'CapnpLexer' + task.sourceFile = file('src/main/java/com/sercapnp/lang/Capnp.flex') + task.targetOutputDir = layout.buildDirectory.dir('generated-src/com/sercapnp/lang') + task.targetClass = 'CapnpLexer' task.purgeOldFiles = true } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 1948b90..d64cd49 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 76f6783..37f78a6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,7 @@ -#Tue Oct 16 16:34:22 EDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip - diff --git a/gradlew b/gradlew index cccdd3d..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,127 @@ -#!/usr/bin/env sh +#!/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 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="" +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && 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 + # 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" + 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 @@ -81,92 +130,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=SC2039,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=SC2039,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" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; 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 # 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=$((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" -# 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")" +# 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, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +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 e95643d..6689b85 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@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 @@ -9,19 +25,23 @@ 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% +@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= +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% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,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% @@ -45,38 +65,26 @@ 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 -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/settings.gradle b/settings.gradle index 2ac52c6..a3820a3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1 @@ rootProject.name = 'sercapnp' - diff --git a/src/main/java/com/sercapnp/actions/GenerateCapnpID.java b/src/main/java/com/sercapnp/actions/GenerateCapnpID.java index 4c94684..242a9b6 100644 --- a/src/main/java/com/sercapnp/actions/GenerateCapnpID.java +++ b/src/main/java/com/sercapnp/actions/GenerateCapnpID.java @@ -16,26 +16,27 @@ public class GenerateCapnpID extends AnAction { @Override public void actionPerformed(AnActionEvent e) { //Get all the required data from data keys - final Editor editor = e.getRequiredData(CommonDataKeys.EDITOR); - final Project project = e.getRequiredData(CommonDataKeys.PROJECT); + final Editor editor = e.getData(CommonDataKeys.EDITOR); + final Project project = e.getData(CommonDataKeys.PROJECT); + + if (editor == null || project == null) { + return; + } + //Access document, caret, and selection final Document document = editor.getDocument(); final SelectionModel selectionModel = editor.getSelectionModel(); - final int start = selectionModel.getSelectionStart(); - final int end = selectionModel.getSelectionEnd(); //New instance of Runnable to make a replacement - Runnable runnable = new Runnable() { - @Override - public void run() { - // return hex(random.randint(0, 2 ** 64) | 1 << 63) - // from 0 to 64 - BigInteger rand = new BigInteger(64, new Random()); - rand = rand.or(new BigInteger("1").shiftLeft(63)); - String capnpId = rand.toString(16); - document.setText( String.format("@0x%s; \n\n", capnpId) + document.getText()); - } + Runnable runnable = () -> { + // return hex(random.randint(0, 2 ** 64) | 1 << 63) + // from 0 to 64 + BigInteger rand = new BigInteger(64, new Random()); + rand = rand.or(new BigInteger("1").shiftLeft(63)); + String capnpId = rand.toString(16); + document.setText( String.format("@0x%s; \n\n", capnpId) + document.getText()); }; + //Making the replacement WriteCommandAction.runWriteCommandAction(project, runnable); selectionModel.removeSelection(); diff --git a/src/main/java/com/sercapnp/actions/NewFileAction.java b/src/main/java/com/sercapnp/actions/NewFileAction.java index a117a37..2db220b 100644 --- a/src/main/java/com/sercapnp/actions/NewFileAction.java +++ b/src/main/java/com/sercapnp/actions/NewFileAction.java @@ -15,6 +15,6 @@ protected String getFileName(String newName) { } public NewFileAction() { - super(FILE_TYPE.getName(), "", null); + super(FILE_TYPE::getName, FILE_TYPE::getDescription, FILE_TYPE::getIcon); } } diff --git a/src/main/java/com/sercapnp/lang/CapnpColorSettingsPage.java b/src/main/java/com/sercapnp/lang/CapnpColorSettingsPage.java index c430370..836521a 100644 --- a/src/main/java/com/sercapnp/lang/CapnpColorSettingsPage.java +++ b/src/main/java/com/sercapnp/lang/CapnpColorSettingsPage.java @@ -2,6 +2,7 @@ /** * Created by meetzli on 6/29/25. + * Patched by lilyslvr on 2/5/26 for Intellij Platform v2 Compatability */ import com.intellij.openapi.editor.colors.TextAttributesKey; @@ -39,14 +40,15 @@ public SyntaxHighlighter getHighlighter() { @NotNull @Override public String getDemoText() { - return "# Cap'n Proto example\n" + - "@0x85150b117366d14b;\n" + - "\n" + - "struct Person {\n" + - " id @0 :UInt32;\n" + - " name @1 :Text;\n" + - " email @2 :Text;\n" + - "}"; + return """ + # Cap'n Proto example + @0x85150b117366d14b; + + struct Person { + id @0 :UInt32; + name @1 :Text; + email @2 :Text; + }"""; } @Nullable @@ -57,13 +59,13 @@ public Map getAdditionalHighlightingTagToDescriptorMa @NotNull @Override - public AttributesDescriptor[] getAttributeDescriptors() { + public AttributesDescriptor @NotNull [] getAttributeDescriptors() { return DESCRIPTORS; } @NotNull @Override - public ColorDescriptor[] getColorDescriptors() { + public ColorDescriptor @NotNull [] getColorDescriptors() { return ColorDescriptor.EMPTY_ARRAY; } diff --git a/src/main/java/com/sercapnp/lang/CapnpFile.java b/src/main/java/com/sercapnp/lang/CapnpFile.java index 78980be..74b4d50 100644 --- a/src/main/java/com/sercapnp/lang/CapnpFile.java +++ b/src/main/java/com/sercapnp/lang/CapnpFile.java @@ -4,7 +4,6 @@ * Created by striky on 6/26/17. */ - import com.intellij.extapi.psi.PsiFileBase; import com.intellij.openapi.fileTypes.FileType; import com.intellij.psi.FileViewProvider; diff --git a/src/main/java/com/sercapnp/lang/CapnpLanguage.java b/src/main/java/com/sercapnp/lang/CapnpLanguage.java index de18c03..14a0f1f 100644 --- a/src/main/java/com/sercapnp/lang/CapnpLanguage.java +++ b/src/main/java/com/sercapnp/lang/CapnpLanguage.java @@ -1,6 +1,7 @@ package com.sercapnp.lang; import com.intellij.lang.Language; +import org.jetbrains.annotations.NotNull; public class CapnpLanguage extends Language { public static final CapnpLanguage INSTANCE = new CapnpLanguage(); @@ -10,7 +11,7 @@ private CapnpLanguage() { } @Override - public String getDisplayName() { + public @NotNull String getDisplayName() { return super.getDisplayName(); } } diff --git a/src/main/java/com/sercapnp/lang/CapnpLexerAdapter.java b/src/main/java/com/sercapnp/lang/CapnpLexerAdapter.java index c906056..e72abcf 100644 --- a/src/main/java/com/sercapnp/lang/CapnpLexerAdapter.java +++ b/src/main/java/com/sercapnp/lang/CapnpLexerAdapter.java @@ -10,12 +10,11 @@ */ public class CapnpLexerAdapter extends FlexAdapter { public CapnpLexerAdapter() { - super(new CapnpLexer((Reader) null)); + super(new CapnpLexer(null)); } @Override public IElementType getTokenType() { - IElementType token = super.getTokenType(); - return token; + return super.getTokenType(); } } diff --git a/src/main/java/com/sercapnp/lang/CapnpParserDefinition.java b/src/main/java/com/sercapnp/lang/CapnpParserDefinition.java index 7223436..04b5c96 100644 --- a/src/main/java/com/sercapnp/lang/CapnpParserDefinition.java +++ b/src/main/java/com/sercapnp/lang/CapnpParserDefinition.java @@ -48,15 +48,15 @@ public PsiParser createParser(final Project project) { } @Override - public IFileElementType getFileNodeType() { + public @NotNull IFileElementType getFileNodeType() { return FILE; } - public PsiFile createFile(FileViewProvider viewProvider) { + public @NotNull PsiFile createFile(@NotNull FileViewProvider viewProvider) { return new CapnpFile(viewProvider); } - public SpaceRequirements spaceExistanceTypeBetweenTokens(ASTNode left, ASTNode right) { + public @NotNull SpaceRequirements spaceExistenceTypeBetweenTokens(ASTNode left, ASTNode right) { return SpaceRequirements.MAY; } diff --git a/src/main/java/com/sercapnp/lang/CapnpSyntaxHighlighter.java b/src/main/java/com/sercapnp/lang/CapnpSyntaxHighlighter.java index 02be5c4..9f40e13 100644 --- a/src/main/java/com/sercapnp/lang/CapnpSyntaxHighlighter.java +++ b/src/main/java/com/sercapnp/lang/CapnpSyntaxHighlighter.java @@ -16,8 +16,6 @@ import static com.intellij.openapi.editor.colors.TextAttributesKey.createTextAttributesKey; - - public class CapnpSyntaxHighlighter extends SyntaxHighlighterBase { public static final TextAttributesKey SEPARATOR = createTextAttributesKey("SIMPLE_SEPARATOR", DefaultLanguageHighlighterColors.OPERATION_SIGN); @@ -50,7 +48,7 @@ public Lexer getHighlightingLexer() { @NotNull @Override - public TextAttributesKey[] getTokenHighlights(IElementType tokenType) { + public TextAttributesKey @NotNull [] getTokenHighlights(IElementType tokenType) { if (tokenType.equals(CapnpTypes.SEPARATOR)) { return SEPARATOR_KEYS; } else if (tokenType.equals(CapnpTypes.IDENTIFIER)){ diff --git a/src/main/java/com/sercapnp/lang/CapnpTypes.java b/src/main/java/com/sercapnp/lang/CapnpTypes.java index f11bfc0..685ee25 100644 --- a/src/main/java/com/sercapnp/lang/CapnpTypes.java +++ b/src/main/java/com/sercapnp/lang/CapnpTypes.java @@ -1,8 +1,6 @@ package com.sercapnp.lang; -import com.intellij.lang.Language; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.tree.IFileElementType; /** * Created by striky on 6/26/17. diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 1dcc67a..641a512 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,32 +1,14 @@ - com.sercapnp - SerCapnp - 2.0 - xmonader - - - - - -
  • Updated for IntelliJ Platform 2025.1
    • -
  • Support for all JetBrains IDEs
    • -
  • Bug fixes and compatibility improvements
    • - - ]]>     - - com.intellij.modules.platform com.intellij.modules.lang - + @@ -36,16 +18,14 @@ Capnp Support for Intellij-based IDEs - - - - + - +