Establish buildable modules and shared host-service boundaries
This commit is contained in:
@@ -0,0 +1,35 @@
|
||||
import org.jetbrains.intellij.platform.gradle.TestFrameworkType
|
||||
plugins {
|
||||
java
|
||||
id("org.jetbrains.intellij.platform") version "2.20.1"
|
||||
}
|
||||
group = "de.neitzel.fxdesigner"
|
||||
version = "0.1.0-SNAPSHOT"
|
||||
repositories {
|
||||
mavenLocal { content { includeGroup("de.neitzel.fxdesigner") } }
|
||||
mavenCentral()
|
||||
intellijPlatform { defaultRepositories() }
|
||||
}
|
||||
java { sourceCompatibility = JavaVersion.VERSION_25; targetCompatibility = JavaVersion.VERSION_25 }
|
||||
tasks.withType<JavaCompile>().configureEach { options.release.set(25) }
|
||||
val fxPlatform = if (System.getProperty("os.arch") == "aarch64") "mac-aarch64" else "mac"
|
||||
dependencies {
|
||||
implementation("de.neitzel.fxdesigner:designer-kit-ui:0.1.0-SNAPSHOT")
|
||||
intellijPlatform {
|
||||
local(providers.gradleProperty("ideaHome").orElse(providers.environmentVariable("IDEA_HOME")))
|
||||
testFramework(TestFrameworkType.Platform)
|
||||
}
|
||||
// Maven platform profiles are not selected by Gradle: include the qualified macOS natives explicitly.
|
||||
listOf("base", "controls", "fxml", "graphics", "media", "swing", "web").forEach {
|
||||
runtimeOnly("org.openjfx:javafx-$it:26:$fxPlatform")
|
||||
}
|
||||
testImplementation("junit:junit:4.13.2")
|
||||
}
|
||||
intellijPlatform {
|
||||
pluginConfiguration {
|
||||
name = "Neitzel FX Designer"
|
||||
ideaVersion { sinceBuild = "263.7307.200"; untilBuild = "263.*" }
|
||||
}
|
||||
instrumentCode = false
|
||||
}
|
||||
tasks.test { useJUnit(); jvmArgs("-Djava.awt.headless=true") }
|
||||
@@ -0,0 +1,2 @@
|
||||
org.gradle.jvmargs=-Xmx2g
|
||||
org.gradle.configuration-cache=false
|
||||
Binary file not shown.
@@ -0,0 +1,9 @@
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-bin.zip
|
||||
networkTimeout=10000
|
||||
validateDistributionUrl=true
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
|
||||
distributionSha256Sum=a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806
|
||||
+248
@@ -0,0 +1,248 @@
|
||||
#!/bin/sh
|
||||
|
||||
#
|
||||
# Copyright © 2015 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.
|
||||
#
|
||||
# SPDX-License-Identifier: Apache-2.0
|
||||
#
|
||||
|
||||
##############################################################################
|
||||
#
|
||||
# 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/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||
# within the Gradle project.
|
||||
#
|
||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||
#
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
|
||||
# Resolve links: $0 may be a link
|
||||
app_path=$0
|
||||
|
||||
# Need this for daisy-chained symlinks.
|
||||
while
|
||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||
[ -h "$app_path" ]
|
||||
do
|
||||
ls=$( ls -ld "$app_path" )
|
||||
link=${ls#*' -> '}
|
||||
case $link in #(
|
||||
/*) app_path=$link ;; #(
|
||||
*) app_path=$APP_HOME$link ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
||||
|
||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||
MAX_FD=maximum
|
||||
|
||||
warn () {
|
||||
echo "$*"
|
||||
} >&2
|
||||
|
||||
die () {
|
||||
echo
|
||||
echo "$*"
|
||||
echo
|
||||
exit 1
|
||||
} >&2
|
||||
|
||||
# OS specific support (must be 'true' or 'false').
|
||||
cygwin=false
|
||||
msys=false
|
||||
darwin=false
|
||||
nonstop=false
|
||||
case "$( uname )" in #(
|
||||
CYGWIN* ) cygwin=true ;; #(
|
||||
Darwin* ) darwin=true ;; #(
|
||||
MSYS* | MINGW* ) msys=true ;; #(
|
||||
NONSTOP* ) nonstop=true ;;
|
||||
esac
|
||||
|
||||
|
||||
|
||||
# Determine the Java command to use to start the JVM.
|
||||
if [ -n "$JAVA_HOME" ] ; then
|
||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||
# IBM's JDK on AIX uses strange locations for the executables
|
||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||
else
|
||||
JAVACMD=$JAVA_HOME/bin/java
|
||||
fi
|
||||
if [ ! -x "$JAVACMD" ] ; then
|
||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||
|
||||
Please set the JAVA_HOME variable in your environment to match the
|
||||
location of your Java installation."
|
||||
fi
|
||||
else
|
||||
JAVACMD=java
|
||||
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" && ! "$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
|
||||
|
||||
# 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" )
|
||||
|
||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||
|
||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||
for arg do
|
||||
if
|
||||
case $arg in #(
|
||||
-*) false ;; # don't mess with options #(
|
||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||
[ -e "$t" ] ;; #(
|
||||
*) false ;;
|
||||
esac
|
||||
then
|
||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||
fi
|
||||
# Roll the args list around exactly as many times as the number of
|
||||
# args, so each arg winds up back in the position where it started, but
|
||||
# possibly modified.
|
||||
#
|
||||
# NB: a `for` loop captures its iteration list before it begins, so
|
||||
# changing the positional parameters here affects neither the number of
|
||||
# iterations, nor the values presented in `arg`.
|
||||
shift # remove old arg
|
||||
set -- "$@" "$arg" # push replacement arg
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
# 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 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" \
|
||||
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
|
||||
"$@"
|
||||
|
||||
# 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" "$@"
|
||||
Vendored
+93
@@ -0,0 +1,93 @@
|
||||
@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
|
||||
@rem SPDX-License-Identifier: Apache-2.0
|
||||
@rem
|
||||
|
||||
@if "%DEBUG%"=="" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%"=="" set DIRNAME=.
|
||||
@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="-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% equ 0 goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:findJavaFromJavaHome
|
||||
set JAVA_HOME=%JAVA_HOME:"=%
|
||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
||||
|
||||
if exist "%JAVA_EXE%" goto execute
|
||||
|
||||
echo. 1>&2
|
||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||
echo. 1>&2
|
||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||
echo location of your Java installation. 1>&2
|
||||
|
||||
goto fail
|
||||
|
||||
:execute
|
||||
@rem Setup the command line
|
||||
|
||||
|
||||
|
||||
@rem Execute Gradle
|
||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
|
||||
|
||||
:end
|
||||
@rem End local scope for the variables with windows NT shell
|
||||
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!
|
||||
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
|
||||
|
||||
:omega
|
||||
@@ -0,0 +1,2 @@
|
||||
pluginManagement { repositories { gradlePluginPortal(); mavenCentral() } }
|
||||
rootProject.name = "designer-intellij"
|
||||
+213
@@ -0,0 +1,213 @@
|
||||
package de.neitzel.fxdesigner.intellij;
|
||||
|
||||
import com.intellij.openapi.application.*;
|
||||
import com.intellij.openapi.command.WriteCommandAction;
|
||||
import com.intellij.openapi.command.undo.UndoManager;
|
||||
import com.intellij.openapi.editor.*;
|
||||
import com.intellij.openapi.editor.event.*;
|
||||
import com.intellij.openapi.fileEditor.*;
|
||||
import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Disposer;
|
||||
import com.intellij.openapi.vfs.*;
|
||||
import de.neitzel.fxdesigner.contracts.*;
|
||||
import de.neitzel.fxdesigner.host.*;
|
||||
import java.net.URI;
|
||||
import java.nio.file.*;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.*;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
|
||||
/**
|
||||
* Adapts actual IntelliJ Documents and native commands/history; never creates a competing undo
|
||||
* store.
|
||||
*/
|
||||
public final class IntellijDocuments implements HostServices.Documents, AutoCloseable {
|
||||
private final Project project;
|
||||
private final com.intellij.openapi.Disposable lifetime;
|
||||
private final Map<Path, State> states = new HashMap<>();
|
||||
private final Set<Handle> handles = new HashSet<>();
|
||||
private boolean closed;
|
||||
|
||||
private static final class State {
|
||||
VirtualFile file;
|
||||
Document document;
|
||||
String disk;
|
||||
AtomicLong revision = new AtomicLong();
|
||||
}
|
||||
|
||||
public IntellijDocuments(Project project) {
|
||||
this.project = Objects.requireNonNull(project);
|
||||
lifetime = this::disposeResources;
|
||||
Disposer.register(project, lifetime);
|
||||
}
|
||||
|
||||
private <T> CompletionStage<T> edt(Callable<T> action) {
|
||||
var future = new CompletableFuture<T>();
|
||||
Runnable task =
|
||||
() ->
|
||||
WriteIntentReadAction.run(
|
||||
() -> {
|
||||
try {
|
||||
if (closed || project.isDisposed() || Disposer.isDisposed(lifetime))
|
||||
throw new IllegalStateException("Designer host disposed");
|
||||
future.complete(action.call());
|
||||
} catch (Throwable e) {
|
||||
future.completeExceptionally(e);
|
||||
}
|
||||
});
|
||||
if (ApplicationManager.getApplication().isDispatchThread()) task.run();
|
||||
else ApplicationManager.getApplication().invokeLater(task, ModalityState.any());
|
||||
return future;
|
||||
}
|
||||
|
||||
public CompletionStage<DocumentSession> open(URI uri) {
|
||||
return edt(
|
||||
() -> {
|
||||
Path path = Path.of(uri).toRealPath();
|
||||
State state = states.get(path);
|
||||
if (state == null) {
|
||||
state = new State();
|
||||
state.file = LocalFileSystem.getInstance().refreshAndFindFileByNioFile(path);
|
||||
if (state.file == null) throw new IllegalArgumentException("Missing file: " + path);
|
||||
state.document = FileDocumentManager.getInstance().getDocument(state.file);
|
||||
if (state.document == null) throw new IllegalArgumentException("Not a text document");
|
||||
state.disk = Files.readString(path);
|
||||
var observed = state;
|
||||
state.document.addDocumentListener(
|
||||
new DocumentListener() {
|
||||
@Override
|
||||
public void documentChanged(DocumentEvent e) {
|
||||
observed.revision.incrementAndGet();
|
||||
}
|
||||
},
|
||||
lifetime);
|
||||
states.put(path, state);
|
||||
}
|
||||
var handle = new Handle(state);
|
||||
handles.add(handle);
|
||||
return handle;
|
||||
});
|
||||
}
|
||||
|
||||
private DocumentSnapshot snapshot(State s) {
|
||||
return new DocumentSnapshot(
|
||||
Path.of(s.file.getPath()).toUri(),
|
||||
s.revision.get(),
|
||||
s.document.getText(),
|
||||
s.document.isWritable() && s.file.isWritable(),
|
||||
FileDocumentManager.getInstance().isDocumentUnsaved(s.document));
|
||||
}
|
||||
|
||||
private final class Handle implements DocumentSession {
|
||||
private final State s;
|
||||
private boolean released;
|
||||
private Editor editor;
|
||||
|
||||
Handle(State s) {
|
||||
this.s = s;
|
||||
}
|
||||
|
||||
private <T> CompletionStage<T> run(Callable<T> action) {
|
||||
return edt(
|
||||
() -> {
|
||||
if (released) throw new IllegalStateException("Document handle closed");
|
||||
return action.call();
|
||||
});
|
||||
}
|
||||
|
||||
public CompletionStage<DocumentSnapshot> snapshot() {
|
||||
return run(() -> IntellijDocuments.this.snapshot(s));
|
||||
}
|
||||
|
||||
public CompletionStage<DocumentSnapshot> apply(EditBatch edits) {
|
||||
return run(
|
||||
() -> {
|
||||
edits.applyTo(IntellijDocuments.this.snapshot(s));
|
||||
var ranges = new ArrayList<>(edits.replacements());
|
||||
ranges.sort(Comparator.comparingInt(EditBatch.Replacement::start));
|
||||
Collections.reverse(ranges);
|
||||
WriteCommandAction.runWriteCommandAction(
|
||||
project,
|
||||
edits.name(),
|
||||
java.util.UUID.randomUUID().toString(),
|
||||
() -> {
|
||||
for (var range : ranges)
|
||||
s.document.replaceString(range.start(), range.end(), range.text());
|
||||
});
|
||||
return IntellijDocuments.this.snapshot(s);
|
||||
});
|
||||
}
|
||||
|
||||
public CompletionStage<DocumentSnapshot> undo() {
|
||||
return history(false);
|
||||
}
|
||||
|
||||
public CompletionStage<DocumentSnapshot> redo() {
|
||||
return history(true);
|
||||
}
|
||||
|
||||
private CompletionStage<DocumentSnapshot> history(boolean redo) {
|
||||
return run(
|
||||
() -> {
|
||||
if (!s.document.isWritable() || !s.file.isWritable())
|
||||
throw new IllegalStateException("Read-only document");
|
||||
if (editor == null)
|
||||
editor = EditorFactory.getInstance().createEditor(s.document, project);
|
||||
var textEditor = TextEditorProvider.getInstance().getTextEditor(editor);
|
||||
var undo = UndoManager.getInstance(project);
|
||||
if (redo) {
|
||||
if (undo.isRedoAvailable(textEditor)) undo.redo(textEditor);
|
||||
} else if (undo.isUndoAvailable(textEditor)) undo.undo(textEditor);
|
||||
return IntellijDocuments.this.snapshot(s);
|
||||
});
|
||||
}
|
||||
|
||||
public CompletionStage<DocumentSnapshot> save(long revision) {
|
||||
return run(
|
||||
() -> {
|
||||
if (s.revision.get() != revision)
|
||||
throw new ConcurrentModificationException("Stale save");
|
||||
if (!s.document.isWritable() || !s.file.isWritable())
|
||||
throw new IllegalStateException("Read-only document");
|
||||
Path file = Path.of(s.file.getPath());
|
||||
if (!Files.readString(file).equals(s.disk))
|
||||
throw new ConcurrentModificationException("External change; draft retained");
|
||||
FileDocumentManager.getInstance().saveDocument(s.document);
|
||||
if (FileDocumentManager.getInstance().isDocumentUnsaved(s.document))
|
||||
throw new IllegalStateException("IDE did not save document");
|
||||
s.disk = Files.readString(file);
|
||||
return IntellijDocuments.this.snapshot(s);
|
||||
});
|
||||
}
|
||||
|
||||
private void release() {
|
||||
if (released) return;
|
||||
released = true;
|
||||
if (editor != null) EditorFactory.getInstance().releaseEditor(editor);
|
||||
handles.remove(this);
|
||||
}
|
||||
|
||||
public void close() {
|
||||
edt(
|
||||
() -> {
|
||||
release();
|
||||
return null;
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
private void disposeResources() {
|
||||
for (var h : List.copyOf(handles)) h.release();
|
||||
closed = true;
|
||||
states.clear();
|
||||
}
|
||||
|
||||
public void close() {
|
||||
edt(
|
||||
() -> {
|
||||
Disposer.dispose(lifetime);
|
||||
return null;
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,68 @@
|
||||
package de.neitzel.fxdesigner.intellij;
|
||||
|
||||
import com.intellij.openapi.application.ApplicationManager;
|
||||
import com.intellij.openapi.application.WriteIntentReadAction;
|
||||
import com.intellij.openapi.fileEditor.OpenFileDescriptor;
|
||||
import com.intellij.openapi.project.Project;
|
||||
import com.intellij.openapi.util.Disposer;
|
||||
import com.intellij.openapi.vfs.LocalFileSystem;
|
||||
import de.neitzel.fxdesigner.host.*;
|
||||
import java.nio.file.Path;
|
||||
import java.util.concurrent.*;
|
||||
|
||||
/**
|
||||
* IDE composition; shared build execution exposes output/cancellation to IDE presentation
|
||||
* callbacks.
|
||||
*/
|
||||
public final class IntellijHost implements AutoCloseable {
|
||||
private final SessionScope scope = new SessionScope();
|
||||
private final HostServices services;
|
||||
|
||||
public IntellijHost(
|
||||
Project project, HostServices.Runtimes runtimes, HostServices.Diagnostics diagnostics) {
|
||||
var docs = scope.own(new IntellijDocuments(project));
|
||||
var builds = new ProcessBuilds();
|
||||
services =
|
||||
new HostServices(
|
||||
docs,
|
||||
(request, output) -> scope.own(builds.start(request, output)),
|
||||
runtimes,
|
||||
location -> {
|
||||
var result = new CompletableFuture<Void>();
|
||||
ApplicationManager.getApplication()
|
||||
.invokeLater(
|
||||
() ->
|
||||
WriteIntentReadAction.run(
|
||||
() -> {
|
||||
try {
|
||||
if (project.isDisposed())
|
||||
throw new IllegalStateException("Project disposed");
|
||||
var file =
|
||||
LocalFileSystem.getInstance()
|
||||
.refreshAndFindFileByNioFile(
|
||||
Path.of(location.document()));
|
||||
if (file == null)
|
||||
throw new IllegalArgumentException(
|
||||
"Navigation file unavailable");
|
||||
new OpenFileDescriptor(project, file, location.offset())
|
||||
.navigate(true);
|
||||
result.complete(null);
|
||||
} catch (Throwable e) {
|
||||
result.completeExceptionally(e);
|
||||
}
|
||||
}));
|
||||
return result;
|
||||
},
|
||||
diagnostics,
|
||||
scope);
|
||||
Disposer.register(project, this::close);
|
||||
}
|
||||
|
||||
public HostServices services() {
|
||||
return services;
|
||||
}
|
||||
|
||||
public void close() {
|
||||
scope.close();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
<idea-plugin require-restart="true">
|
||||
<id>de.neitzel.fxdesigner</id><name>Neitzel FX Designer</name><vendor>Neitzel</vendor>
|
||||
<description>Module and host-service foundation. The FXML designer UI is not registered yet.</description>
|
||||
<depends>com.intellij.modules.platform</depends>
|
||||
</idea-plugin>
|
||||
+72
@@ -0,0 +1,72 @@
|
||||
package de.neitzel.fxdesigner.intellij;
|
||||
|
||||
import com.intellij.testFramework.fixtures.BasePlatformTestCase;
|
||||
import de.neitzel.fxdesigner.contracts.*;
|
||||
import java.nio.file.*;
|
||||
import java.util.*;
|
||||
|
||||
public final class IntellijDocumentsTest extends BasePlatformTestCase {
|
||||
public void testNativeDocumentTransactionUndoAndIndependentHandles() throws Exception {
|
||||
Path file = Files.createTempFile("designer-document-", ".fxml");
|
||||
Files.writeString(file, "abcdef");
|
||||
com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess.allowRootAccess(getTestRootDisposable(), file.toRealPath().toString());
|
||||
try (var docs = new IntellijDocuments(getProject())) {
|
||||
var a = docs.open(file.toUri()).toCompletableFuture().get();
|
||||
var b = docs.open(file.toUri()).toCompletableFuture().get();
|
||||
var initial = a.snapshot().toCompletableFuture().get();
|
||||
var changed =
|
||||
a.apply(
|
||||
new EditBatch(
|
||||
initial.revision(),
|
||||
"Component properties",
|
||||
List.of(
|
||||
new EditBatch.Replacement(0, 1, "A"),
|
||||
new EditBatch.Replacement(5, 6, "F"))))
|
||||
.toCompletableFuture()
|
||||
.get();
|
||||
assertEquals("AbcdeF", b.snapshot().toCompletableFuture().get().text());
|
||||
a.close();
|
||||
var undone = b.undo().toCompletableFuture().get();
|
||||
assertEquals("abcdef", undone.text());
|
||||
assertTrue(undone.revision() > changed.revision());
|
||||
try {
|
||||
b.apply(new EditBatch(initial.revision(), "stale", List.of())).toCompletableFuture().get();
|
||||
fail("Stale edit accepted");
|
||||
} catch (java.util.concurrent.ExecutionException expected) {
|
||||
assertInstanceOf(expected.getCause(), ConcurrentModificationException.class);
|
||||
}
|
||||
var redone = b.redo().toCompletableFuture().get();
|
||||
assertEquals("AbcdeF", redone.text());
|
||||
b.save(redone.revision()).toCompletableFuture().get();
|
||||
assertEquals("AbcdeF", Files.readString(file));
|
||||
b.close();
|
||||
} finally {
|
||||
Files.deleteIfExists(file);
|
||||
}
|
||||
}
|
||||
|
||||
public void testExternalChangesDoNotLoseDraft() throws Exception {
|
||||
Path file = Files.createTempFile("designer-conflict-", ".fxml");
|
||||
Files.writeString(file, "old");
|
||||
com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess.allowRootAccess(getTestRootDisposable(), file.toRealPath().toString());
|
||||
try (var docs = new IntellijDocuments(getProject())) {
|
||||
var d = docs.open(file.toUri()).toCompletableFuture().get();
|
||||
var changed =
|
||||
d.apply(new EditBatch(0, "edit", List.of(new EditBatch.Replacement(0, 3, "draft"))))
|
||||
.toCompletableFuture()
|
||||
.get();
|
||||
Files.writeString(file, "external");
|
||||
try {
|
||||
d.save(changed.revision()).toCompletableFuture().get();
|
||||
fail("Conflict accepted");
|
||||
} catch (java.util.concurrent.ExecutionException expected) {
|
||||
assertInstanceOf(expected.getCause(), ConcurrentModificationException.class);
|
||||
}
|
||||
assertEquals("draft", d.snapshot().toCompletableFuture().get().text());
|
||||
assertEquals("external", Files.readString(file));
|
||||
d.close();
|
||||
} finally {
|
||||
Files.deleteIfExists(file);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user