diff options
Diffstat (limited to 'language-web')
5 files changed, 5 insertions, 5 deletions
diff --git a/language-web/src/main/js/index.tsx b/language-web/src/main/js/index.tsx index 3e077ba8..d368c9ba 100644 --- a/language-web/src/main/js/index.tsx +++ b/language-web/src/main/js/index.tsx | |||
@@ -38,7 +38,7 @@ direct rule createChild(p): | |||
38 | children(p, q) = true, | 38 | children(p, q) = true, |
39 | taxStatus(q, child) = true. | 39 | taxStatus(q, child) = true. |
40 | 40 | ||
41 | individual family. | 41 | indiv family. |
42 | Family(family). | 42 | Family(family). |
43 | members(family, anne). | 43 | members(family, anne). |
44 | members(family, bob). | 44 | members(family, bob). |
diff --git a/language-web/src/main/js/language/problem.grammar b/language-web/src/main/js/language/problem.grammar index 0cbfa831..bccc2e31 100644 --- a/language-web/src/main/js/language/problem.grammar +++ b/language-web/src/main/js/language/problem.grammar | |||
@@ -35,7 +35,7 @@ statement { | |||
35 | IndividualNodeName ":" Constant "." | 35 | IndividualNodeName ":" Constant "." |
36 | } | | 36 | } | |
37 | IndividualDeclaration { | 37 | IndividualDeclaration { |
38 | ckw<"individual"> sep<",", IndividualNodeName> "." | 38 | ckw<"indiv"> sep<",", IndividualNodeName> "." |
39 | } | | 39 | } | |
40 | ScopeDeclaration { | 40 | ScopeDeclaration { |
41 | kw<"scope"> sep<",", ScopeElement> "." | 41 | kw<"scope"> sep<",", ScopeElement> "." |
diff --git a/language-web/src/main/js/language/problemLanguageSupport.ts b/language-web/src/main/js/language/problemLanguageSupport.ts index 1dba3447..6508a2c0 100644 --- a/language-web/src/main/js/language/problemLanguageSupport.ts +++ b/language-web/src/main/js/language/problemLanguageSupport.ts | |||
@@ -27,7 +27,7 @@ const parserWithMetadata = (parser as LRParser).configure({ | |||
27 | styleTags({ | 27 | styleTags({ |
28 | LineComment: t.lineComment, | 28 | LineComment: t.lineComment, |
29 | BlockComment: t.blockComment, | 29 | BlockComment: t.blockComment, |
30 | 'problem class enum pred rule individual scope': t.definitionKeyword, | 30 | 'problem class enum pred rule indiv scope': t.definitionKeyword, |
31 | 'abstract extends refers contains opposite error direct default': t.modifier, | 31 | 'abstract extends refers contains opposite error direct default': t.modifier, |
32 | 'true false unknown error': t.keyword, | 32 | 'true false unknown error': t.keyword, |
33 | 'new delete': t.operatorKeyword, | 33 | 'new delete': t.operatorKeyword, |
diff --git a/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java b/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java index d34a1610..a26ce040 100644 --- a/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java +++ b/language-web/src/test/java/tools/refinery/language/web/ProblemWebSocketServletIntegrationTest.java | |||
@@ -96,7 +96,7 @@ class ProblemWebSocketServletIntegrationTest { | |||
96 | case 0 -> session.getRemote().sendString( | 96 | case 0 -> session.getRemote().sendString( |
97 | "{\"id\":\"foo\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"fullText\":\"class Person.\n\"}}"); | 97 | "{\"id\":\"foo\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"fullText\":\"class Person.\n\"}}"); |
98 | case 3 -> session.getRemote().sendString( | 98 | case 3 -> session.getRemote().sendString( |
99 | "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"requiredStateId\":\"-80000000\",\"deltaText\":\"individual q.\nnode(q).\n\",\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}"); | 99 | "{\"id\":\"bar\",\"request\":{\"resource\":\"test.problem\",\"serviceType\":\"update\",\"requiredStateId\":\"-80000000\",\"deltaText\":\"indiv q.\nnode(q).\n\",\"deltaOffset\":\"0\",\"deltaReplaceLength\":\"0\"}}"); |
100 | case 5 -> session.close(); | 100 | case 5 -> session.close(); |
101 | } | 101 | } |
102 | } | 102 | } |
diff --git a/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java b/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java index 3229597e..5b8fedba 100644 --- a/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java +++ b/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/TransactionExecutorTest.java | |||
@@ -92,7 +92,7 @@ class TransactionExecutorTest { | |||
92 | var stateId = updateFullText(); | 92 | var stateId = updateFullText(); |
93 | var responseHandler = sendRequestAndWaitForAllResponses( | 93 | var responseHandler = sendRequestAndWaitForAllResponses( |
94 | new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId", | 94 | new XtextWebRequest("bar", Map.of("resource", RESOURCE_NAME, "serviceType", "update", "requiredStateId", |
95 | stateId, "deltaText", "individual q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", "0"))); | 95 | stateId, "deltaText", "indiv q.\nnode(q).\n", "deltaOffset", "0", "deltaReplaceLength", "0"))); |
96 | 96 | ||
97 | var captor = newCaptor(); | 97 | var captor = newCaptor(); |
98 | verify(responseHandler, times(2)).onResponse(captor.capture()); | 98 | verify(responseHandler, times(2)).onResponse(captor.capture()); |