Fix struct tokenization

PhilippeChab · Oct 23, 2023 · 0d90955 · 0d90955
1 parent e1f4643
commit 0d90955
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/server/src/Tokenizer/Tokenizer.ts b/server/src/Tokenizer/Tokenizer.ts
@@ -225,9 +225,9 @@ export default class Tokenizer {
   private isStructDeclaration(token: IToken, lastToken: IToken, lineIndex: number, tokensArrays: (IToken[] | undefined)[]) {
     return (
       token.scopes.includes(LanguageScopes.structIdentifier) &&
-      ((lastToken.scopes.includes(LanguageScopes.structIdentifier) &&
-        lastToken.scopes.includes(LanguageScopes.blockDeclaraction)) ||
-        tokensArrays[lineIndex + 1]?.at(0)?.scopes.includes(LanguageScopes.blockDeclaraction))
+      ((tokensArrays[lineIndex + 1]?.at(0)?.scopes.includes(LanguageScopes.blockDeclaraction) &&
+        lastToken.scopes.includes(LanguageScopes.structIdentifier)) ||
+        lastToken.scopes.includes(LanguageScopes.blockDeclaraction))
     );
   }