arnekeller/Typicalc
1
0
Fork 0
mirror of https://gitlab.kit.edu/uskyk/typicalc.git synced 2024-11-09 19:00:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code style fixes

Browse Source
This commit is contained in:
Arne Keller 2021-02-02 10:55:46 +01:00
parent 87eaad1d5a
commit 9d4e225d16
8 changed files with 29 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
frontend/src/mathjax-setup.js
View File

@ -86,19 +86,20 @@ window.MathJax = {
const html = mathjax.document(root, {InputJax, OutputJax});
html.render();
const svg = root.querySelector("svg");
window.svgPanZoomFun(svg);
var nodeIterator = svg.querySelectorAll("g[data-mml-node='mtr']");
for (var a of nodeIterator) {
var left = null;
var i = 0;
for (var node of a.childNodes) {
if (i == 1 || i == 3) {
const nodeIterator = svg.querySelectorAll("g[data-mml-node='mtr']");
let counter = 0;
for (const a of nodeIterator) {
counter++;
let left = null;
let i = 0;
for (const node of a.childNodes) {
if (i === 1 || i === 3) {
i += 1;
continue;
}
var bbox = node.getBBox();
var mat = node.transform.baseVal[0];
if (mat != undefined) {
const bbox = node.getBBox();
const mat = node.transform.baseVal[0];
if (mat !== undefined) {
bbox.x += mat.matrix.e;
}
if (left == null) {
@ -110,6 +111,10 @@ window.MathJax = {
i += 1;
}
}
if (counter >= 3) {
// should not be used on empty SVGs
window.svgPanZoomFun(svg);
}
if (callback != null) {
callback(html);
}

10
src/main/java/edu/kit/typicalc/model/parser/TypeAssumptionParser.java
View File

@ -43,8 +43,6 @@ public class TypeAssumptionParser {
return new Result<>(token);
}
Token t = token.unwrap();
//System.err.println(t);
//System.err.println("expecting " + parenCount);
Type type;
int removedParens = 0;
switch (t.getType()) {
@ -66,26 +64,21 @@ public class TypeAssumptionParser {
default:
return new Result<>(null, ParseError.UNEXPECTED_TOKEN.withToken(t));
}
//System.err.println("acquired type " + type);
while (true) {
token = lexer.nextToken();
//System.err.println("new token " + token.unwrap());
if (token.isError()) {
return new Result<>(token);
}
t = token.unwrap();
if (t.getType() == TokenType.RIGHT_PARENTHESIS) {
//System.err.println("returning " + type);
parenCount -= 1;
removedParens += 1;
if (parenCount <= 0) {
return new Result<>(new ImmutablePair<>(type, removedParens));
} else {
continue;
}
continue;
}
if (t.getType() == TokenType.EOF) {
//System.err.println("returning " + type);
return new Result<>(new ImmutablePair<>(type, removedParens));
}
if (t.getType() != TokenType.ARROW) {
@ -96,7 +89,6 @@ public class TypeAssumptionParser {
return nextType;
}
type = new FunctionType(type, nextType.unwrap().getLeft());
//System.err.println("constructed " + type);
removedParens += nextType.unwrap().getRight();
parenCount -= nextType.unwrap().getRight();
if (parenCount < 0) {

5
src/main/java/edu/kit/typicalc/view/TypicalcI18NProvider.java
View File

@ -4,7 +4,6 @@ import java.util.List;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
import com.vaadin.flow.i18n.I18NProvider;
@ -36,10 +35,6 @@ public class TypicalcI18NProvider implements I18NProvider {
@Override
public String getTranslation(String key, Locale locale, Object... params) {
if (key == null) {
return StringUtils.EMPTY;
}
final ResourceBundle bundle = ResourceBundle.getBundle(LANGUAGE_BUNDLE_PREFIX, locale);
String translation;

2
src/main/java/edu/kit/typicalc/view/content/infocontent/StartPageView.java
View File

@ -10,6 +10,7 @@ import edu.kit.typicalc.view.content.ControlPanel;
import edu.kit.typicalc.view.content.ControlPanelView;
import edu.kit.typicalc.view.content.typeinferencecontent.MathjaxProofTree;
import edu.kit.typicalc.view.content.typeinferencecontent.MathjaxUnification;
import edu.kit.typicalc.view.content.typeinferencecontent.ShareDialog;
import edu.kit.typicalc.view.main.MainViewImpl;
import edu.kit.typicalc.view.main.MathjaxDisplay;
@ -65,6 +66,7 @@ public class StartPageView extends VerticalLayout implements ControlPanelView {
@Override
public void shareButton() {
new ShareDialog("currentURL", "latexPkgs", "\\LaTeX").open(); // TODO
}
private int currentStep = 0;

2
src/main/java/edu/kit/typicalc/view/content/typeinferencecontent/ShareDialog.java
View File

@ -17,7 +17,7 @@ public class ShareDialog extends Dialog implements LocaleChangeObserver {
* in other LaTeX documents. Should be in the form „\\usepackage<package>“
* @param latexCode LaTeX code for users to copy into their own LaTeX document(s)
*/
protected ShareDialog(String url, String latexPackages, String latexCode) {
public ShareDialog(String url, String latexPackages, String latexCode) {
}

12
src/main/java/edu/kit/typicalc/view/main/InputBar.java
View File

@ -31,7 +31,7 @@ public class InputBar extends HorizontalLayout implements LocaleChangeObserver {
*/
private static final String INPUT_FIELD_ID = "inputField";
private static final String INPUT_BAR_ID = "inputBar";
private static final short MAX_INPUT_LENGTH = 1000;
private final Icon infoIcon;
@ -49,7 +49,7 @@ public class InputBar extends HorizontalLayout implements LocaleChangeObserver {
protected InputBar(final Consumer<String> callback) {
infoIcon = new Icon(VaadinIcon.INFO_CIRCLE);
infoIcon.addClickListener(event -> onInfoIconClick());
inputField = new TextField();
inputField.setId(INPUT_FIELD_ID);
inputField.setClearButtonVisible(true);
@ -63,19 +63,19 @@ public class InputBar extends HorizontalLayout implements LocaleChangeObserver {
add(infoIcon, exampleButton, lambdaButton, inputField, inferTypeButton);
setId(INPUT_BAR_ID);
}
protected void reset() {
inputField.clear();
}
private void onInputFieldValueChange() {
inputField.getOptionalValue().ifPresent(value -> inputField
.setValue(value.replace(getTranslation("root.backslash"), getTranslation("root.lambda"))));
.setValue(value.replace("\\", getTranslation("root.lambda"))));
}
private void onTypeInferButtonClick(final Consumer<String> callback) {
final String currentInput = inputField.getOptionalValue().orElse(StringUtils.EMPTY);
if (currentInput.length() < MAX_INPUT_LENGTH) {
callback.accept(currentInput);
} else {

8
src/main/java/edu/kit/typicalc/view/main/UpperBar.java
View File

@ -41,8 +41,8 @@ public class UpperBar extends HorizontalLayout {
private final Button rules;
private final transient MainViewListener presenter;
private final Consumer<Component> setContent;
private final transient Consumer<Component> setContent;
/**
* Initializes a new UpperBar with the provided mainViewListener.
*
@ -52,7 +52,7 @@ public class UpperBar extends HorizontalLayout {
protected UpperBar(final MainViewListener presenter, final Consumer<Component> setContent) {
this.presenter = presenter;
this.setContent = setContent;
this.viewTitle = new H1(getTranslation("root.typicalc"));
viewTitle.addClickListener(event -> routeToStartPage());
viewTitle.setId(VIEW_TITLE_ID);
@ -83,7 +83,7 @@ public class UpperBar extends HorizontalLayout {
presenter.typeInferLambdaString(lambdaString, new HashMap<>());
}
}
private void routeToStartPage() {
setContent.accept(new StartPageView());
UI.getCurrent().getPage().getHistory().replaceState(null, StringUtils.EMPTY);

1
src/main/resources/language/general.properties
View File

@ -1,3 +1,2 @@
root.backslash=\\
root.lambda=\u03BB
root.home=home