Merge pull request #3 from source-academy/hz/next

Hz/next

Author: mug1wara26

server/src/rules/ifStatement.ts

@@ -11,7 +11,7 @@ export const ifStatementRule = new class extends Rule<IfStatement> {
       ast.addDiagnostic(`Missing "else" in "if-else" statement`, DiagnosticSeverity.Error, { start: child.loc!.start, end: child.consequent.loc!.start });
     if (child.consequent.type !== STATEMENTS.BLOCK)
       ast.addDiagnostic("Missing curly braces around if", DiagnosticSeverity.Error, child.consequent.loc!);
-    if (child.alternate && child.alternate.type !== STATEMENTS.BLOCK)
+    if (child.alternate && child.alternate.type !== STATEMENTS.BLOCK && child.alternate.type !== STATEMENTS.IF)
       ast.addDiagnostic("Missing curly braces around else", DiagnosticSeverity.Error, child.alternate.loc!);
   }
-}();
+}();

server/src/server.ts

@@ -48,19 +48,15 @@ function getAST(uri: string): AST {
   let context = contextCache.get(uri);
   if (!context) {
     context = DEFAULT_CONTEXT;
-    contextCache.set(uri, DEFAULT_CONTEXT);
     console.log(`No context found for ${uri}, using default context ${JSON.stringify(DEFAULT_CONTEXT)}`);
   }
-  // console.log(`Creating AST for ${uri} with context ${JSON.stringify(context)}`);
 
-  // const ast = new AST(documents.get(uri)!.getText(), context, uri, 4);
   const ast = new AST(documents.get(uri)!.getText(), context, uri);
   astCache.set(uri, ast);
   return ast;
 }
 
 connection.onInitialize((params: InitializeParams) => {
-  connection.console.log('LSP INIT');
   let capabilities = params.capabilities;
 
   // Does the client support the `workspace/configuration` request?
@@ -213,25 +209,16 @@ connection.onHover((params: HoverParams): Hover | null => {
 })
 
 connection.onRequest("source/publishInfo", (info: { [uri: string]: Context }) => {
-  connection.console.log("Info");
-  connection.console.log(JSON.stringify(info));
-
   for (const [uri, context] of Object.entries(info)) {
-    const document = documents.get(uri);
-    if (document) {
-      let oldContext = contextCache.get(uri);
-      if (!oldContext) {
-        oldContext = context;
-        contextCache.set(uri, context);
-        astCache.delete(uri);
+    const oldContext = contextCache.get(uri);
+    if (!oldContext || context.chapter !== oldContext.chapter || context.prepend !== oldContext.prepend) {
+      // Context has been added or changed for this URI
+      contextCache.set(uri, context);
+      astCache.delete(uri);
+      const document = documents.get(uri);
+      if (document) {
         validateTextDocument(document)
       }
-      // Check if context changed
-      else if (context.chapter !== oldContext.chapter || context.prepend !== oldContext.prepend) {
-        contextCache.set(uri, context);
-        astCache.delete(uri);
-        validateTextDocument(document);
-      }
     }
   }
 
@@ -242,4 +229,4 @@ connection.onRequest("source/publishInfo", (info: { [uri: string]: Context }) =>
 documents.listen(connection);
 
 // Listen on the connection
-connection.listen();
+connection.listen();