Skip to content

Fix for #3683: Hiding package prefixes in sequent view #3684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
WolframPfeifer wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix for #3683: Hiding package prefixes in sequent view #3684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b08bdb6
fix view option 'Hide Package Prefix', highlight 'instance' function
WolframPfeifer Nov 12, 2025
c47ef23
formatting
WolframPfeifer Nov 12, 2025
a98b0ce
Merge branch 'main' into pfeifer/3683hidePackageOptionFix
Drodt Jan 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions key.core/src/main/java/de/uka/ilkd/key/pp/LogicPrinter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,19 +936,32 @@ && getNotationInfo().isHidePackagePrefix()) {
} else {
String name = t.op().name().toString();
layouter.startTerm(t.arity());
boolean alreadyPrinted = false;

if (t.op() instanceof SortDependingFunction op) {
if (op.getKind().compareTo(JavaDLTheory.EXACT_INSTANCE_NAME) == 0) {
layouter.print(op.getSortDependingOn().declarationString());

// remove package prefix from SortDependingFunction
if (notationInfo.isHidePackagePrefix()) {
String sort = op.getSortDependingOn().declarationString();
int index = sort.lastIndexOf('.');
sort = sort.substring(index + 1);
layouter.print(sort);
layouter.print("::");
layouter.keyWord(op.getKind().toString());
alreadyPrinted = true;

name = op.getKind().toString();
}

// mark instance and exactInstance as keywords
if (op.getKind().compareTo(JavaDLTheory.EXACT_INSTANCE_NAME) == 0
|| op.getKind().compareTo(JavaDLTheory.INSTANCE_NAME) == 0) {
isKeyword = true;
}
}
if (isKeyword) {
layouter.markStartKeyword();
}
if (!alreadyPrinted) {
if (isKeyword) {
layouter.keyWord(name);
} else {
layouter.print(name);
}
if (isKeyword) {
Expand Down Expand Up @@ -980,7 +993,13 @@ public void printCast(String pre, String post, JTerm t, int ass) {

layouter.startTerm(t.arity());
layouter.print(pre);
layouter.print(cast.getSortDependingOn().toString());
String sort = cast.getSortDependingOn().toString();
// remove package prefix from sort name
if (notationInfo.isHidePackagePrefix()) {
int index = sort.lastIndexOf('.');
sort = sort.substring(index + 1);
}
layouter.print(sort);
layouter.print(post);
maybeParens(t.sub(0), ass);
}
Expand Down
4 changes: 3 additions & 1 deletion key.core/src/main/java/de/uka/ilkd/key/pp/NotationInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import de.uka.ilkd.key.ldt.*;
import de.uka.ilkd.key.logic.label.TermLabel;
import de.uka.ilkd.key.logic.op.*;
import de.uka.ilkd.key.settings.ProofIndependentSettings;
import de.uka.ilkd.key.settings.ProofSettings;
import de.uka.ilkd.key.util.UnicodeHelper;

Expand Down Expand Up @@ -420,7 +421,8 @@ public void refresh(Services services, boolean usePrettyPrinting, boolean useUni
} else {
this.notationTable = createDefaultNotation();
}
hidePackagePrefix = DEFAULT_HIDE_PACKAGE_PREFIX;
ProofIndependentSettings pis = ProofIndependentSettings.DEFAULT_INSTANCE;
hidePackagePrefix = pis.getViewSettings().isHidePackagePrefix();

if (services != null && services.getProof() != null) {
ProofSettings settings = services.getProof().getSettings();
Expand Down
4 changes: 2 additions & 2 deletions key.ui/src/main/java/de/uka/ilkd/key/gui/nodeviews/HTMLSyntaxHighlighter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ public class HTMLSyntaxHighlighter {

private final static String[] DYNAMIC_LOGIC_KEYWORDS =
{ "\\forall", "\\exists", "TRUE", "FALSE", "\\if", "\\then", "\\else", "\\sum", "bsum",
"\\in", "exactInstance", "wellFormed", "measuredByEmpty", "<created>", "<inv>", "\\cup",
"" + FORALL, "" + EXISTS, "" + IN, "" + EMPTY };
"\\in", "instance", "exactInstance", "wellFormed", "measuredByEmpty", "<created>",
"<inv>", "\\cup", "" + FORALL, "" + EXISTS, "" + IN, "" + EMPTY };

private final static String DYNAMIC_LOGIC_KEYWORDS_REGEX =
concat("|", Arrays.asList(DYNAMIC_LOGIC_KEYWORDS), input -> Pattern.quote((String) input));
Expand Down