arnekeller/Typicalc
1
0
Fork 0
mirror of https://gitlab.kit.edu/uskyk/typicalc.git synced 2024-11-14 13:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
607 Commits 4 Branches 0 Tags 5.4 MiB
0c2836a27f
Commit Graph

500 Commits

Author SHA1 Message Date
Arne Keller
a2b4a06e50 Fix share dialog size 2021-02-17 16:36:06 +01:00
Arne Keller
74cd76767a Update translations + fix empty type assumption 2021-02-17 15:43:28 +01:00
Moritz Dieing
49c767bd0f Add typeInfer button to helpDialog 2021-02-16 16:17:02 +01:00
Moritz Dieing
8c77bd62e5 English version of error strings 2021-02-16 15:23:53 +01:00
Moritz Dieing
cee2a964cc Improved error message 2021-02-16 14:53:40 +01:00
Arne Keller
2bbba50ddc Fix Typicalc link 2021-02-16 12:31:15 +01:00
Johanna Stuber
86226f896e FunctionType::constrainEqualToFunction : swap types for newly created constraint -> less confusing 2021-02-15 16:54:21 +01:00
Johanna Stuber
bbf24cae78 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-15 16:42:56 +01:00
Johanna Stuber
8ca72a77e2 typos in operating help, add let example from Übungsblatt 2021-02-15 16:42:45 +01:00
ucrhh
00511cb4d3 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-15 16:14:30 +01:00
ucrhh
9539776e8e remove most outer parentheses in a lambda term 2021-02-15 16:14:10 +01:00
Johanna Stuber
13c746a0b1 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-15 16:10:44 +01:00
Johanna Stuber
0fa1b09190 use SortedSet for quantifiedVariables in TypeAbstraction so instantiation is predictable 2021-02-15 16:07:59 +01:00
ucrhh
9894c13df6 remove solved todo 2021-02-15 15:59:08 +01:00
Moritz Dieing
38c3a61882 Set height and accordion width 2021-02-14 13:57:05 +01:00
Arne Keller
0bb88280b8 Set size only for help dialog 2021-02-14 13:51:08 +01:00
Arne Keller
ed21276f46 Workaround for Vaadin weirdness 2021-02-14 13:13:09 +01:00
Moritz Dieing
b2209bcdaf Set dialog width in java 
Css solution did not work when all accordion panels were closed
 2021-02-14 12:05:46 +01:00
Arne Keller
5a9903e754 Move style to CSS files 2021-02-13 17:49:29 +01:00
Moritz Dieing
81b74bd92d Use classic drawer toggle 
Use classic drawer toggle since its described in help content now.
 2021-02-13 15:03:49 +01:00
Moritz Dieing
7357b69373 English version of help content 2021-02-13 14:52:44 +01:00
Moritz Dieing
89eca4f33d German version of help content 2021-02-13 13:31:53 +01:00
Arne Keller
7aacca6941 More type parser tests 2021-02-13 10:31:08 +01:00
Arne Keller
c6eb794049 Focus new type assumption field 2021-02-13 10:31:08 +01:00
ucrhh
0e1c596702 remove spacing around scrollbar 2021-02-13 10:24:48 +01:00
Arne Keller
c49c1c4a23 Fix translation encoding again 2021-02-13 09:51:10 +01:00
Moritz Dieing
288e954f3e Suggestion for design of help dialog 2021-02-13 01:40:58 +01:00
Arne Keller
ecd92c9369 Fix error coloring and translation 2021-02-12 15:29:49 +01:00
ucrhh
c46aee15a1 swap parentheses with curly 2021-02-12 15:23:38 +01:00
ucrhh
36c4e850e6 first 'real' LatexCreatorConstraint test 2021-02-12 14:43:00 +01:00
ucrhh
6cf1de6780 undo error with dollar signs 2021-02-12 14:31:53 +01:00
ucrhh
af16a6bd87 javadoc 2021-02-12 14:08:21 +01:00
ucrhh
6128871223 fix some todos 2021-02-12 13:49:08 +01:00
ucrhh
a8652642fc move unification error to end of unification 2021-02-12 12:40:39 +01:00
ucrhh
dabde5e455 make final type look consistent to Übungsblatt 2021-02-12 12:31:45 +01:00
ucrhh
1d8a01fc02 fix bug where error in unification would cause mathjax not rendering 2021-02-11 22:40:37 +01:00
ucrhh
5265439b62 align unification steps 2021-02-11 22:37:29 +01:00
ucrhh
337a88d8f4 add newly created constraints to other end of constraint list in unification 2021-02-11 21:54:52 +01:00
ucrhh
72ed9bdc32 order constraints and substitutions in unification according to meeting 2021-02-11 21:49:29 +01:00
ucrhh
9851ac61da add more explanation to unification 2021-02-11 21:27:08 +01:00
ucrhh
1cc94a3125 constraints dont disappear during unification 2021-02-11 20:05:26 +01:00
ucrhh
cab3fcc4aa Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-11 15:35:47 +01:00
ucrhh
73802e50fb partial LatexCreatorConstraintsTest 2021-02-11 15:35:37 +01:00
Johanna Stuber
0fdc8d3509 delete accidentally pasted line 2021-02-11 15:20:37 +01:00
Johanna Stuber
ad99cc09b8 fix checkstyle 2021-02-11 15:17:51 +01:00
Johanna Stuber
8351a21f78 visitLet() test; for that add several equals()-methods; return constraints in right order in Tree::getConstraints() 2021-02-11 15:15:49 +01:00
ucrhh
8446bc5a04 fix checkstyle 2021-02-11 14:56:00 +01:00
ucrhh
cfc25ed81f fix little inconsistency 2021-02-11 14:54:09 +01:00
ucrhh
fff1b3a23f remove not needed localeChange(null) calls 2021-02-11 14:43:51 +01:00
ucrhh
47d78be6db styling, add missing translation keys 2021-02-11 14:41:03 +01:00
Arne Keller
970172855e Remove test header 2021-02-11 12:38:03 +01:00
Arne Keller
7878b5fc83 DRY translation setup + Vaadin bug workaround 2021-02-11 12:30:13 +01:00
Arne Keller
a00cd12d2e Fix info dialog close button position 2021-02-11 12:28:32 +01:00
ucrhh
ef071309ec add package-info to LatexCreator package 2021-02-11 11:23:11 +01:00
ucrhh
f614869677 add ConstraintSetIndexFactoryTest 2021-02-11 11:15:42 +01:00
ucrhh
ad4581fffb add LatexCreatorTermTest 2021-02-11 11:00:39 +01:00
Johanna Stuber
367c3be0e1 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-11 10:12:30 +01:00
Johanna Stuber
7e2357f2f2 use LinkedHashMap for typeAssumptions so they appear sorted in the tree 2021-02-11 10:12:17 +01:00
ucrhh
0379cf5db6 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-11 09:51:47 +01:00
ucrhh
e621c764be test TreeNumberGenerator 2021-02-11 09:51:32 +01:00
Johanna Stuber
9966e43759 fix first/last step with let tree; use trash symbol to delete a sinlge typeAssumption 2021-02-11 09:44:08 +01:00
ucrhh
e9b80794b6 move LatexCreator classes into one package 2021-02-11 08:55:16 +01:00
Moritz Dieing
cbd6144ada Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-10 17:27:08 +01:00
Moritz Dieing
2ba52fbae0 Fix lambda button insertion 2021-02-10 17:27:05 +01:00
Arne Keller
503de3ad88 Return unmodifiable list in tree number generator 2021-02-10 16:46:34 +01:00
ucrhh
dd1caafcf6 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-10 16:36:02 +01:00
ucrhh
fe00b5147a disable margin for scroller 2021-02-10 16:35:29 +01:00
Arne Keller
2b237797e8 Fix char addition issue 2021-02-10 16:00:32 +01:00
Arne Keller
c1ce7a9181 Fix type parser bug 2021-02-10 15:01:03 +01:00
Arne Keller
f1fe6fce02 Highlight erroring constraint 2021-02-10 14:48:02 +01:00
Arne Keller
300f9fa02d Remove unused import 2021-02-10 13:26:25 +01:00
Arne Keller
b0638ead8b Add a favicon 2021-02-10 13:24:47 +01:00
Johanna Stuber
3b5d4cf924 correct type grammar 2021-02-10 11:59:00 +01:00
Moritz Dieing
44f862512d Handle multiple type assumptions with same var 2021-02-10 10:11:17 +01:00
Moritz Dieing
23be70b57c More java docs 2021-02-10 09:51:47 +01:00
Arne Keller
3e153dc0d3 Fix checkstyle issue 2021-02-10 08:24:31 +01:00
ucrhh
cadc299791 partly fix issues with failing sub inference 2021-02-09 22:51:54 +01:00
ucrhh
34a727e0c0 add final type to mgu in LatexCreator 2021-02-09 22:19:22 +01:00
ucrhh
363646f6d2 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-09 22:09:57 +01:00
ucrhh
585b402cd7 add border to proof tree 2021-02-09 22:09:34 +01:00
Moritz Dieing
3babfe238d Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-09 21:43:54 +01:00
Moritz Dieing
57ad91423b Some java docs 2021-02-09 21:43:47 +01:00
ucrhh
7db36724ea stop tree animation during unification 2021-02-09 21:40:07 +01:00
ucrhh
28025a25c2 add let constraint to outer constraint set 2021-02-09 17:17:11 +01:00
ucrhh
f49fb3f984 implement prefix for unification and mgu 2021-02-09 16:54:29 +01:00
Arne Keller
985824b3eb Type assumptions in URL 2021-02-08 16:07:56 +01:00
Arne Keller
8ffcac164a Checkstyle issue fix 2021-02-08 09:55:09 +01:00
Arne Keller
22705727cb Misc. adjustments 
Properties file was encoded using latin1 again!

The JaCoCo agent should not execute when running the server,
use mvn jacoco:prepare-agent test jacoco:report
when generating test coverage.
 2021-02-08 09:52:09 +01:00
Moritz Dieing
b7d5611755 Implement TypeAssumptions (frontend) 2021-02-08 00:54:40 +01:00
ucrhh
03af53b20a partly implement let constraint generation 2021-02-07 12:07:26 +01:00
Arne Keller
4c48c1dca5 Use client JS for latency-sensitive operation 2021-02-06 21:50:22 +01:00
Moritz Dieing
a88efa7cc7 Correct indentation 2021-02-06 21:34:40 +01:00
Moritz Dieing
d8b569c7b0 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-06 21:32:26 +01:00
Moritz Dieing
1d673485f3 Less javascript to restore cursor 2021-02-06 21:28:47 +01:00
Arne Keller
a25bdfe3dd More javadocs + Vaadin routing fixes 2021-02-06 15:57:53 +01:00
Arne Keller
5a2fcaa5ae Restore cursor position after backslash/lambda replacement 2021-02-06 15:07:02 +01:00
ucrhh
94704e8f7f Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-06 13:30:29 +01:00
ucrhh
e34464f641 refactor LatexCreatorConstraints 2021-02-06 13:30:13 +01:00
Moritz Dieing
c42fd73361 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-06 12:09:40 +01:00
Moritz Dieing
619e6da18c Change drawer width + render on language change 2021-02-06 12:06:49 +01:00
ucrhh
b5f114303f removed mjx context menu 2021-02-06 11:50:17 +01:00
ucrhh
648b5f6752 some doc and codestyle 2021-02-06 11:20:26 +01:00
ucrhh
bc30971b86 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-06 10:59:12 +01:00
ucrhh
d24f3b88f7 span mgu over multiple lines 2021-02-06 10:59:04 +01:00
Johanna Stuber
86b40d2683 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-06 10:58:25 +01:00
Johanna Stuber
6fa50cbf31 delete todo and comment, make long example inferrable 2021-02-06 10:58:12 +01:00
Arne Keller
d3fd5b99a8 Set page title to lambda term 2021-02-06 10:57:35 +01:00
Arne Keller
c9512b57d2 Fix display of inference tree after reload 2021-02-06 10:42:02 +01:00
ucrhh
ffac808366 page title set to 'Typicalc' across all pages 2021-02-06 10:37:39 +01:00
ucrhh
09ce138bc2 use constant instead of magic string 2021-02-06 10:33:04 +01:00
ucrhh
a01811936e constraints get generated in correct order 2021-02-06 10:28:58 +01:00
ucrhh
0201efdc9c drawer refreshed on lacaleChange 2021-02-06 10:12:31 +01:00
Moritz Dieing
4c98976059 Extends content of infoDialog 2021-02-05 23:58:19 +01:00
Moritz Dieing
4fc610c75e Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-05 21:39:48 +01:00
Moritz Dieing
2895f84988 Fix and improve languageSelect 2021-02-05 21:39:40 +01:00
Arne Keller
3fb9853cb3 Fix encoding of resource file 2021-02-05 19:18:31 +01:00
Arne Keller
0dc3e47695 Code style 2021-02-05 19:13:03 +01:00
Arne Keller
2b0657cdfc Fix MathJax line length + big example 2021-02-05 19:13:03 +01:00
Moritz Dieing
8f0ca5d2ba Fix JavaDoc 2021-02-05 18:52:31 +01:00
Moritz Dieing
4d44136528 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-05 18:49:13 +01:00
Moritz Dieing
54e0777eab Content for info dialog 2021-02-05 18:48:13 +01:00
Arne Keller
5f2454f2d1 TypeAssumptionsArea class skeleton 2021-02-05 18:14:12 +01:00
Arne Keller
c78d6b9e0a Fix code style issues 2021-02-05 17:22:43 +01:00
Arne Keller
a7f1556fe6 Fix misc. UI issues 2021-02-05 17:02:08 +01:00
ucrhh
927650f475 add url to share dialog 2021-02-05 15:01:06 +01:00
ucrhh
4857bd83d7 add translations to shareDialog 2021-02-05 13:51:42 +01:00
ucrhh
bd72c1e337 implement shareDialog without URL 2021-02-05 13:31:04 +01:00
Johanna Stuber
8d6842043d only allow ascii characters in variable names 2021-02-05 11:27:36 +01:00
Johanna Stuber
2df0107243 make inference rule appearance consistent with tree appearance 2021-02-05 10:28:06 +01:00
Arne Keller
7494407480 Set SameSite=Strict on cookies 2021-02-04 22:11:21 +01:00
Johanna Stuber
af985f6e86 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-04 22:07:00 +01:00
Johanna Stuber
45b3e9fca1 Add missing \ in translation_en const rule 2021-02-04 22:06:47 +01:00
Arne Keller
87fb6a1ef8 Fix checkstyle issue 2021-02-04 21:18:22 +01:00
Arne Keller
bdabb010b0 LatexCreator unification error display (incomplete) 2021-02-04 21:03:04 +01:00
Johanna Stuber
218b8216f4 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-04 20:54:10 +01:00
Johanna Stuber
742f934788 user input types of form t[0-9]+ parse to TypeVariable, everything else to NamedType 2021-02-04 20:54:00 +01:00
Arne Keller
316d3ff7cf VarStepWithLet latex rendering split into 2 lines 2021-02-04 20:30:11 +01:00
Moritz Dieing
e57907c251 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-04 20:09:35 +01:00
Moritz Dieing
cab1e74490 Add language select 2021-02-04 20:09:28 +01:00
Moritz Dieing
a4659f8386 Extend language files 2021-02-04 20:09:09 +01:00
Johanna Stuber
ee18a3cba1 Generate steps withLet in every sub-inference of let terms 2021-02-04 19:31:06 +01:00
Johanna Stuber
5c9f916a6c Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-04 16:50:46 +01:00
Johanna Stuber
49ee20baaa if mgu has no substitution for alpha1, final type is alpha1 2021-02-04 16:50:36 +01:00
ucrhh
bb300e292c implement mgu generation in LatexCreator 2021-02-04 15:31:30 +01:00
Moritz Dieing
886ea78869 Focus inputBar after selecting an example 2021-02-04 13:24:46 +01:00
Moritz Dieing
c10074b4f7 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-04 13:21:37 +01:00
Moritz Dieing
dc257e4b32 JavaDoc for new methods in view 2021-02-04 13:21:29 +01:00
Johanna Stuber
ee41f42249 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-04 13:16:21 +01:00
Johanna Stuber
a0e3eb34a2 LatexCreator for let and const 2021-02-04 13:16:09 +01:00
Moritz Dieing
b4499c6889 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-04 12:58:16 +01:00
Moritz Dieing
8da5bf36a5 Immediately parse backslash to lambda 2021-02-04 12:58:09 +01:00
ucrhh
8885b8a059 implement constraint generation 2021-02-04 12:47:09 +01:00
Johanna Stuber
8dc7fbe725 implement let in TypeInferers 2021-02-04 11:41:08 +01:00
ucrhh
fd00b47928 change substitution sign to another arrow 2021-02-04 10:58:09 +01:00
ucrhh
1564c772d5 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-04 10:49:19 +01:00
ucrhh
46dae40e74 implement typeAssumptions in LatexCreator 2021-02-04 10:49:03 +01:00
Johanna Stuber
e4e4fca350 fix compiling errors after changing TypeAbstrarction's quantifiedVariables from list to set 2021-02-04 10:25:19 +01:00
Johanna Stuber
a80d1f9059 Additional TypeAbstraction constructor, for that implement getFreeTypeVariables() on types 2021-02-04 10:17:54 +01:00
Johanna Stuber
c3d5d9147c Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-04 09:27:56 +01:00
Johanna Stuber
29ca293fce better handling of optionals 2021-02-04 09:27:46 +01:00
Arne Keller
62d7c9f5e1 Fix parsing of (λx.x)λx.x 2021-02-03 16:09:58 +01:00
Arne Keller
b87e444f0b LatexCreator Unification 2021-02-03 15:45:53 +01:00
ucrhh
3fba4ae1be Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-03 15:27:30 +01:00
ucrhh
e2788a1c81 changed indexing of variables 2021-02-03 15:27:18 +01:00
Arne Keller
b1aa3e05a9 Move LatexCreatorType to own class 2021-02-03 15:22:17 +01:00
Arne Keller
0cb09b92ec Increase size of SVG to 100% 2021-02-03 15:10:51 +01:00
uogau
9e77c422f2 TypeAssumptionParser und ModelImpl angepasst 2021-02-03 13:40:56 +01:00
ucrhh
874b648caf Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-03 11:09:28 +01:00
ucrhh
cc400fc314 set URL when inferring type 2021-02-03 11:09:14 +01:00
Johanna Stuber
c44082693d Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-03 11:08:10 +01:00
Johanna Stuber
d3add97c1e Implement most of Tree::visit(letTerm), for that add EmptyStep 2021-02-03 11:07:50 +01:00
ucrhh
02f10158d6 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-03 10:40:42 +01:00
ucrhh
70c4f5ce43 read lambda term from url 2021-02-03 10:40:23 +01:00
Johanna Stuber
4bc4b8a14a TypeInfererLet now implementation of TypeInfererInterface 2021-02-03 07:56:48 +01:00
Johanna Stuber
e5d29822f7 Test for TypeInferenceResult::getType(); sort mgu by kind, then index; checkstyle 2021-02-03 07:50:52 +01:00
Moritz Dieing
1b943bbb02 Simple integration tests and structure for screenshot test 2021-02-02 20:42:35 +01:00
Arne Keller
9d4e225d16 Code style fixes 2021-02-02 10:55:46 +01:00
Arne Keller
87eaad1d5a Unification implementation 2021-02-02 10:29:45 +01:00
Moritz Dieing
edb025fafb setContent for startpage + exception handling 2021-02-01 20:26:22 +01:00
Arne Keller
10cd63abb4 Panning and zooming of inference tree 2021-02-01 16:19:13 +01:00
ucrhh
321ed10eb5 add small caps to latex creator 2021-02-01 16:14:18 +01:00
Arne Keller
15ede65458 Make drawer more obvious 2021-02-01 15:35:15 +01:00
Arne Keller
9d7a16cc86 Limit area of key listeners 2021-02-01 15:16:29 +01:00
ucrhh
9c8edf2e07 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-01 15:14:09 +01:00
ucrhh
9f215ab650 delete empty route of StartPageView 2021-02-01 15:14:01 +01:00
Arne Keller
2d92294736 LambdaTerm toString 2021-02-01 15:11:19 +01:00
ucrhh
07f16ed2d0 Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-02-01 14:42:50 +01:00
ucrhh
7e80d79838 add NotFoundView 2021-02-01 14:42:33 +01:00
uogau
a00b340691 Merge remote-tracking branch 'origin/master' 2021-02-01 14:14:28 +01:00
uogau
8929a59e82 createLetStep hinzugefügt 2021-02-01 14:14:18 +01:00
ucrhh
fbb3d6fd63 better passing of TypeInferer to TypeInferenceView, allows for custom URL 2021-02-01 14:02:16 +01:00
Arne Keller
64312cd172 More parser error handling tests 2021-02-01 11:08:31 +01:00
Arne Keller
f8ac91cdd8 Type assumption parser implementation + tests 2021-02-01 10:50:44 +01:00
uogau
d95ba1eb7c *-import entfernt 2021-02-01 01:27:03 +01:00
uogau
d57e431782 ModelImpl: typeAssumptions parsen lassen 
einige Parameter final gemacht
Fehlende Javadocs
 2021-02-01 01:24:51 +01:00
Moritz Dieing
c1cf786d3f package info for view and view.main 2021-02-01 00:31:50 +01:00
Johanna Stuber
784d04992e Merge branch 'master' of https://git.scc.kit.edu/pse-typinferenz/typicalc 2021-01-31 21:16:57 +01:00
ucrhh
f1554d602a move LatexCreator constants into seperate class 2021-01-31 18:10:07 +01:00
Johanna Stuber
622851aaaa Implement TypeInfererLet::getLetConstraints() 2021-01-31 17:41:27 +01:00
Johanna Stuber
e31cb5efeb Fix inconsistency due to merge 2021-01-31 17:13:39 +01:00