From ac73c31388afdffe7e56236cd619a7a08eb1fac8 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Sat, 30 Oct 2021 21:25:41 +0200
Subject: feat(web): use 4 space for indentation

---
 language-web/src/main/js/index.tsx                 | 22 +++++++++++-----------
 language-web/src/main/js/language/indentation.ts   |  2 +-
 .../src/main/js/language/problemLanguageSupport.ts |  5 ++++-
 3 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'language-web/src/main/js')

diff --git a/language-web/src/main/js/index.tsx b/language-web/src/main/js/index.tsx
index 13a62af0..595498fc 100644
--- a/language-web/src/main/js/index.tsx
+++ b/language-web/src/main/js/index.tsx
@@ -9,27 +9,27 @@ import { ThemeProvider } from './theme/ThemeProvider';
 import '../css/index.scss';
 
 const initialValue = `class Family {
-  contains Person[] members
+    contains Person[] members
 }
 
 class Person {
-  Person[] children opposite parent
-  Person[0..1] parent opposite children
-  int age
-  TaxStatus taxStatus
+    Person[] children opposite parent
+    Person[0..1] parent opposite children
+    int age
+    TaxStatus taxStatus
 }
 
 enum TaxStatus {
-  child, student, adult, retired
+    child, student, adult, retired
 }
 
 % A child cannot have any dependents.
 pred invalidTaxStatus(Person p) <->
-  taxStatus(p, child),
-  children(p, _q)
-; taxStatus(p, retired),
-  parent(p, q),
-  !taxStatus(q, retired).
+    taxStatus(p, child),
+    children(p, _q)
+  ; taxStatus(p, retired),
+    parent(p, q),
+    !taxStatus(q, retired).
 
 unique family.
 Family(family).
diff --git a/language-web/src/main/js/language/indentation.ts b/language-web/src/main/js/language/indentation.ts
index b2f0134b..973b4a80 100644
--- a/language-web/src/main/js/language/indentation.ts
+++ b/language-web/src/main/js/language/indentation.ts
@@ -78,7 +78,7 @@ export function indentDeclaration(context: TreeIndentContext): number {
 export function indentPredicate(context: TreeIndentContext): number {
   const clauseIndent = indentDeclarationStrategy(context, 1);
   if (/^\s+(;|\.)/.exec(context.textAfter) !== null) {
-    return clauseIndent - context.unit;
+    return clauseIndent - 2;
   }
   return clauseIndent;
 }
diff --git a/language-web/src/main/js/language/problemLanguageSupport.ts b/language-web/src/main/js/language/problemLanguageSupport.ts
index c9e61b31..80d25d71 100644
--- a/language-web/src/main/js/language/problemLanguageSupport.ts
+++ b/language-web/src/main/js/language/problemLanguageSupport.ts
@@ -3,6 +3,7 @@ import {
   foldInside,
   foldNodeProp,
   indentNodeProp,
+  indentUnit,
   LanguageSupport,
   LRLanguage,
 } from '@codemirror/language';
@@ -79,5 +80,7 @@ const problemLanguage = LRLanguage.define({
 });
 
 export function problemLanguageSupport(): LanguageSupport {
-  return new LanguageSupport(problemLanguage);
+  return new LanguageSupport(problemLanguage, [
+    indentUnit.of('    '),
+  ]);
 }
-- 
cgit v1.2.3-54-g00ecf