Commit 4f406712 authored by Lulu Luong's avatar Lulu Luong

Merge remote-tracking branch 'remotes/origin/master' into luonng_variableAssignment

parents 6f8847a6 07477085
Pipeline #29261 passed with stages
in 2 minutes and 41 seconds
plugins {
// id 'io.franzbecker.gradle-lombok' version '1.14' apply false
id "com.github.ben-manes.versions" version "0.17.0"
}
......@@ -43,7 +42,6 @@ subprojects {
compile group: 'org.apache.logging.log4j', name: 'log4j-api', version: '2.11.0'
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version: '2.11.0'
testCompile group: 'junit', name: 'junit', version: '4.12'
//compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.16.20'
compileOnly files("$rootDir/lombok-edge.jar")
compileOnly group: 'org.projectlombok', name: 'lombok', version: '1.16.20'
}
}
......@@ -77,7 +77,7 @@ public class RuleCommandHandler implements CommandHandler<KeyData> {
try {
for (SequentFormula sf : g.node().sequent().succedent()) {
ImmutableList<TacletApp> apps = index.getTacletAppAtAndBelow(filter,
new PosInOccurrence(sf, PosInTerm.getTopLevel(), true),
new PosInOccurrence(sf, PosInTerm.getTopLevel(), false),
services);
apps.forEach(t -> set.add(t.taclet().name().toString()));
}
......
......@@ -39,7 +39,7 @@
-fx-font-family: "Inconsolata", monospace;
//-fx-font-family: "Fira Code Medium", monospace;
-fx-font-size: 12pt;
// -fx-font-size: 20pt;
//-fx-font-size: 16pt;
-fx-fill: @base00;
.lineno {
......@@ -153,7 +153,7 @@
// -fx-background-color: @base3;
-fx-font-family: "Inconsolata", monospace;
-fx-font-size: 12pt;
//-fx-font-size: 20pt;
//-fx-font-size: 16pt;
-fx-fill: @base01;
.ABSTRACT, .ASSERT, .BOOLEAN, .BREAK, .BYTE, .CASE, .CATCH, .CHAR, .CLASS, .CONST,
......@@ -249,8 +249,8 @@
}
.sequent-view {
-fx-font-size: 14pt;
// -fx-font-size: 20pt;
//-fx-font-size: 14pt;
-fx-font-size: 16pt;
-fx-background-color: @basenavy;
-fx-fill: black;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment