fix: Adapt to the ancestors order change in Slang v0.14

0xCalibur · Apr 17, 2024 · c550d8a · c550d8a
1 parent 1a7e83d
commit c550d8a
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 13 deletions.
diff --git a/server/src/services/semanticHighlight/highlighters/ContractDefinitionHighlighter.ts b/server/src/services/semanticHighlight/highlighters/ContractDefinitionHighlighter.ts
@@ -14,7 +14,7 @@ export class ContractDefinitionHighlighter extends HighlightVisitor {
       nodeWrapper.type === NodeType.Token &&
       nodeWrapper.kind === TokenKind.Identifier &&
       nodeWrapper.label === NodeLabel.Name &&
-      ancestors[ancestors.length - 1]?.kind === RuleKind.ContractDefinition
+      ancestors[0]?.kind === RuleKind.ContractDefinition
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.type);
     }

diff --git a/server/src/services/semanticHighlight/highlighters/CustomTypeHighlighter.ts b/server/src/services/semanticHighlight/highlighters/CustomTypeHighlighter.ts
@@ -15,7 +15,7 @@ export class CustomTypeHighlighter extends HighlightVisitor {
       nodeWrapper.kind === TokenKind.Identifier &&
       // NOTE: This only supports highlighting the first identifier in the path
       nodeWrapper.label === NodeLabel.Item &&
-      ancestors[ancestors.length - 2]?.kind === RuleKind.TypeName
+      ancestors[1]?.kind === RuleKind.TypeName
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.type);
     }

diff --git a/server/src/services/semanticHighlight/highlighters/EnumDefinitionHighlighter.ts b/server/src/services/semanticHighlight/highlighters/EnumDefinitionHighlighter.ts
@@ -13,7 +13,7 @@ export class EnumDefinitionHighlighter extends HighlightVisitor {
       nodeWrapper.type === NodeType.Token &&
       nodeWrapper.kind === TokenKind.Identifier &&
       nodeWrapper.label === NodeLabel.Name &&
-      ancestors[ancestors.length - 1]?.kind === RuleKind.EnumDefinition
+      ancestors[0]?.kind === RuleKind.EnumDefinition
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.type);
     }

diff --git a/server/src/services/semanticHighlight/highlighters/ErrorDefinitionHighlighter.ts b/server/src/services/semanticHighlight/highlighters/ErrorDefinitionHighlighter.ts
@@ -13,7 +13,7 @@ export class ErrorDefinitionHighlighter extends HighlightVisitor {
       nodeWrapper.type === NodeType.Token &&
       nodeWrapper.kind === TokenKind.Identifier &&
       nodeWrapper.label === NodeLabel.Name &&
-      ancestors[ancestors.length - 1]?.kind === RuleKind.ErrorDefinition
+      ancestors[0]?.kind === RuleKind.ErrorDefinition
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.type);
     }

diff --git a/server/src/services/semanticHighlight/highlighters/EventDefinitionHighlighter.ts b/server/src/services/semanticHighlight/highlighters/EventDefinitionHighlighter.ts
@@ -14,7 +14,7 @@ export class EventDefinitionHighlighter extends HighlightVisitor {
       nodeWrapper.type === NodeType.Token &&
       nodeWrapper.kind === TokenKind.Identifier &&
       nodeWrapper.label === NodeLabel.Name &&
-      ancestors[ancestors.length - 1]?.kind === RuleKind.EventDefinition
+      ancestors[0]?.kind === RuleKind.EventDefinition
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.type);
     }

diff --git a/server/src/services/semanticHighlight/highlighters/EventEmissionHighlighter.ts b/server/src/services/semanticHighlight/highlighters/EventEmissionHighlighter.ts
@@ -14,7 +14,7 @@ export class EventEmissionHighlighter extends HighlightVisitor {
       nodeWrapper.type === NodeType.Token &&
       nodeWrapper.kind === TokenKind.Identifier &&
       // NOTE: This only highlights the first identifier (in path) in the event emission statement
-      ancestors[ancestors.length - 2]?.kind === RuleKind.EmitStatement
+      ancestors[1]?.kind === RuleKind.EmitStatement
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.type);
     }

diff --git a/server/src/services/semanticHighlight/highlighters/FunctionCallHighlighter.ts b/server/src/services/semanticHighlight/highlighters/FunctionCallHighlighter.ts
@@ -14,7 +14,7 @@ export class FunctionCallHighlighter extends HighlightVisitor {
       nodeWrapper.type === NodeType.Token &&
       nodeWrapper.kind === TokenKind.Identifier &&
       // NOTE: This only supports the basic case of a function call with positional arguments "(a,b,c)"
-      ancestors[ancestors.length - 2]?.kind === RuleKind.FunctionCallExpression
+      ancestors[1]?.kind === RuleKind.FunctionCallExpression
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.function);
     }

diff --git a/server/src/services/semanticHighlight/highlighters/FunctionDefinitionHighlighter.ts b/server/src/services/semanticHighlight/highlighters/FunctionDefinitionHighlighter.ts
@@ -15,7 +15,7 @@ export class FunctionDefinitionHighlighter extends HighlightVisitor {
       nodeWrapper.kind === TokenKind.Identifier &&
       // TODO: Support also 'receive' and 'fallback' functions post 0.6.0
       nodeWrapper.label === NodeLabel.Variant &&
-      ancestors[ancestors.length - 2]?.kind === RuleKind.FunctionDefinition
+      ancestors[1]?.kind === RuleKind.FunctionDefinition
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.function);
     }

diff --git a/server/src/services/semanticHighlight/highlighters/InterfaceDefinitionHighlighter.ts b/server/src/services/semanticHighlight/highlighters/InterfaceDefinitionHighlighter.ts
@@ -14,7 +14,7 @@ export class InterfaceDefinitionHighlighter extends HighlightVisitor {
       nodeWrapper.type === NodeType.Token &&
       nodeWrapper.kind === TokenKind.Identifier &&
       nodeWrapper.label === NodeLabel.Name &&
-      ancestors[ancestors.length - 1]?.kind === RuleKind.InterfaceDefinition
+      ancestors[0]?.kind === RuleKind.InterfaceDefinition
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.type);
     }

diff --git a/server/src/services/semanticHighlight/highlighters/LibraryDefinitionHighlighter.ts b/server/src/services/semanticHighlight/highlighters/LibraryDefinitionHighlighter.ts
@@ -13,7 +13,7 @@ export class LibraryDefinitionHighlighter extends HighlightVisitor {
       nodeWrapper.type === NodeType.Token &&
       nodeWrapper.kind === TokenKind.Identifier &&
       nodeWrapper.label === NodeLabel.Name &&
-      ancestors[ancestors.length - 1]?.kind === RuleKind.LibraryDefinition
+      ancestors[0]?.kind === RuleKind.LibraryDefinition
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.type);
     }

diff --git a/server/src/services/semanticHighlight/highlighters/StructDefinitionHighlighter.ts b/server/src/services/semanticHighlight/highlighters/StructDefinitionHighlighter.ts
@@ -14,7 +14,7 @@ export class StructDefinitionHighlighter extends HighlightVisitor {
       nodeWrapper.type === NodeType.Token &&
       nodeWrapper.kind === TokenKind.Identifier &&
       nodeWrapper.label === NodeLabel.Name &&
-      ancestors[ancestors.length - 1]?.kind === RuleKind.StructDefinition
+      ancestors[0]?.kind === RuleKind.StructDefinition
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.type);
     }

diff --git a/.../src/services/semanticHighlight/highlighters/UserDefinedValueTypeDefinitionHighlighter.ts b/.../src/services/semanticHighlight/highlighters/UserDefinedValueTypeDefinitionHighlighter.ts
@@ -13,8 +13,7 @@ export class UserDefinedValueTypeDefinitionHighlighter extends HighlightVisitor
       nodeWrapper.type === NodeType.Token &&
       nodeWrapper.kind === TokenKind.Identifier &&
       nodeWrapper.label === NodeLabel.Name &&
-      ancestors[ancestors.length - 1]?.kind ===
-        RuleKind.UserDefinedValueTypeDefinition
+      ancestors[0]?.kind === RuleKind.UserDefinedValueTypeDefinition
     ) {
       this.tokenBuilder.addToken(nodeWrapper, SemanticTokenTypes.type);
     }