From 562165b263a9ab8e7a94dc6410e909716e0d7d0a Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Mon, 16 Dec 2019 12:44:41 +0100 Subject: [PATCH 1/2] up --- .../support/sniper/SniperJavaPrettyPrinter.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/main/java/spoon/support/sniper/SniperJavaPrettyPrinter.java b/src/main/java/spoon/support/sniper/SniperJavaPrettyPrinter.java index 51058d7c4d1..e366ab0abe9 100644 --- a/src/main/java/spoon/support/sniper/SniperJavaPrettyPrinter.java +++ b/src/main/java/spoon/support/sniper/SniperJavaPrettyPrinter.java @@ -64,6 +64,9 @@ public SniperJavaPrettyPrinter(Environment env) { mutableTokenWriter = new MutableTokenWriter(env); //wrap that TokenWriter to listen on all incoming events and set wrapped version to DJPP setPrinterTokenWriter(createTokenWriterListener(mutableTokenWriter)); + + // newly added elements are not fully qualified + this.setIgnoreImplicit(false); } /** @@ -193,12 +196,11 @@ private static boolean hasImplicitAncestor(CtElement el) { } /** - * SniperPrettyPrinter does not apply preprocessor to a CtElement when calling toString() - * @param element - * @return + * Prints an element in sniper mode */ @Override public String printElement(CtElement element) { + applyPreProcessors(element); if (element != null && !hasImplicitAncestor(element)) { CompilationUnit compilationUnit = element.getPosition().getCompilationUnit(); if (compilationUnit != null @@ -390,7 +392,7 @@ private void runInContext(SourceFragmentContext context, Runnable code) { //remove `context` and all it's child contexts while (true) { if (sourceFragmentContextStack.isEmpty()) { - throw new SpoonException("Inconsistent sourceFragmentContextStack"); //NOSONAR + throw new SpoonException("Inconsistent sourceFragmentContextStack"); } SourceFragmentContext c = sourceFragmentContextStack.pop(); c.onFinished(); @@ -418,9 +420,9 @@ private void runInMutedState(Boolean muted, Runnable code) { //assure that muted status did not changed in between if (mutableTokenWriter.isMuted() != muted) { if (mutableTokenWriter.isMuted()) { - throw new SpoonException("Unexpected state: Token writer is muted after scanning"); //NOSONAR + throw new SpoonException("Unexpected state: Token writer is muted after scanning"); } else { - throw new SpoonException("Unexpected state: Token writer is not muted after scanning"); //NOSONAR + throw new SpoonException("Unexpected state: Token writer is not muted after scanning"); } } mutableTokenWriter.setMuted(originMuted); From ab403e6311974693350aaf455df514860335139d Mon Sep 17 00:00:00 2001 From: Martin Monperrus Date: Mon, 16 Dec 2019 12:46:29 +0100 Subject: [PATCH 2/2] up --- .../java/spoon/support/sniper/SniperJavaPrettyPrinter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/spoon/support/sniper/SniperJavaPrettyPrinter.java b/src/main/java/spoon/support/sniper/SniperJavaPrettyPrinter.java index e366ab0abe9..9dffa3e57cb 100644 --- a/src/main/java/spoon/support/sniper/SniperJavaPrettyPrinter.java +++ b/src/main/java/spoon/support/sniper/SniperJavaPrettyPrinter.java @@ -392,7 +392,7 @@ private void runInContext(SourceFragmentContext context, Runnable code) { //remove `context` and all it's child contexts while (true) { if (sourceFragmentContextStack.isEmpty()) { - throw new SpoonException("Inconsistent sourceFragmentContextStack"); + throw new SpoonException("Inconsistent sourceFragmentContextStack"); //NOSONAR } SourceFragmentContext c = sourceFragmentContextStack.pop(); c.onFinished(); @@ -420,9 +420,9 @@ private void runInMutedState(Boolean muted, Runnable code) { //assure that muted status did not changed in between if (mutableTokenWriter.isMuted() != muted) { if (mutableTokenWriter.isMuted()) { - throw new SpoonException("Unexpected state: Token writer is muted after scanning"); + throw new SpoonException("Unexpected state: Token writer is muted after scanning"); //NOSONAR } else { - throw new SpoonException("Unexpected state: Token writer is not muted after scanning"); + throw new SpoonException("Unexpected state: Token writer is not muted after scanning"); //NOSONAR } } mutableTokenWriter.setMuted(originMuted);