Use newest Slang 0.14.0

server/package.json

@@ -87,7 +87,7 @@
     "yaml": "^2.2.1"
   },
   "dependencies": {
-    "@nomicfoundation/slang": "0.13.1",
+    "@nomicfoundation/slang": "0.14.0",
     "@nomicfoundation/solidity-analyzer": "0.1.1"
   }
 }

server/src/parser/slangHelpers.ts

@@ -16,7 +16,7 @@ export interface SlangNodeWrapper {
   type: NodeType;
   kind: NodeKind;
   text: string;
-  name: string;
+  label: string;
   ancestors: () => SlangNode[];
 }
 

server/src/services/documentSymbol/SymbolVisitor.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { SymbolKind } from "vscode-languageserver-types";
 import _ from "lodash";
-import { FieldName, RuleKind, TokenKind } from "@nomicfoundation/slang/kinds";
+import { NodeLabel, RuleKind, TokenKind } from "@nomicfoundation/slang/kinds";
 import { TokenNode } from "@nomicfoundation/slang/cst";
 import { TextDocument } from "vscode-languageserver-textdocument";
 import { Cursor } from "@nomicfoundation/slang/cursor";
@@ -12,7 +12,7 @@ export abstract class SymbolVisitor {
   public abstract ruleKind: RuleKind;
   public abstract symbolKind: SymbolKind;
   /** The token that contains the name of the symbol represented by the rule. */
-  public abstract nameToken: readonly [FieldName, TokenKind];
+  public abstract nameToken: readonly [NodeLabel, TokenKind];
 
   constructor(
     public document: TextDocument,
@@ -29,7 +29,7 @@ export abstract class SymbolVisitor {
     const childCursor = cursor.spawn();
 
     while (childCursor.goToNextTokenWithKind(this.nameToken[1])) {
-      if (childCursor.nodeName !== this.nameToken[0]) {
+      if (childCursor.label !== this.nameToken[0]) {
         continue;
       }
 

server/src/services/documentSymbol/visitors/ConstantDefinition.ts

@@ -1,9 +1,9 @@
 import { SymbolKind } from "vscode-languageserver-types";
-import { RuleKind, TokenKind, FieldName } from "@nomicfoundation/slang/kinds";
+import { RuleKind, TokenKind, NodeLabel } from "@nomicfoundation/slang/kinds";
 import { SymbolVisitor } from "../SymbolVisitor";
 
 export class ConstantDefinition extends SymbolVisitor {
   public ruleKind = RuleKind.ConstantDefinition;
   public symbolKind = SymbolKind.Constant;
-  public nameToken = [FieldName.Name, TokenKind.Identifier] as const;
+  public nameToken = [NodeLabel.Name, TokenKind.Identifier] as const;
 }

server/src/services/documentSymbol/visitors/ConstructorDefinition.ts

@@ -1,12 +1,12 @@
 import { SymbolKind } from "vscode-languageserver-types";
-import { RuleKind, TokenKind, FieldName } from "@nomicfoundation/slang/kinds";
+import { RuleKind, TokenKind, NodeLabel } from "@nomicfoundation/slang/kinds";
 import { SymbolVisitor } from "../SymbolVisitor";
 
 export class ConstructorDefinition extends SymbolVisitor {
   public ruleKind = RuleKind.ConstructorDefinition;
   public symbolKind = SymbolKind.Constructor;
   public nameToken = [
-    FieldName.ConstructorKeyword,
+    NodeLabel.ConstructorKeyword,
     TokenKind.ConstructorKeyword,
   ] as const;
 }

server/src/services/documentSymbol/visitors/ContractDefinition.ts

@@ -1,9 +1,9 @@
 import { SymbolKind } from "vscode-languageserver-types";
-import { FieldName, RuleKind, TokenKind } from "@nomicfoundation/slang/kinds";
+import { NodeLabel, RuleKind, TokenKind } from "@nomicfoundation/slang/kinds";
 import { SymbolVisitor } from "../SymbolVisitor";
 
 export class ContractDefinition extends SymbolVisitor {
   public ruleKind = RuleKind.ContractDefinition;
   public symbolKind = SymbolKind.Class;
-  public nameToken = [FieldName.Name, TokenKind.Identifier] as const;
+  public nameToken = [NodeLabel.Name, TokenKind.Identifier] as const;
 }

server/src/services/documentSymbol/visitors/EnumDefinition.ts

@@ -1,9 +1,9 @@
 import { SymbolKind } from "vscode-languageserver-types";
-import { FieldName, RuleKind, TokenKind } from "@nomicfoundation/slang/kinds";
+import { NodeLabel, RuleKind, TokenKind } from "@nomicfoundation/slang/kinds";
 import { SymbolVisitor } from "../SymbolVisitor";
 
 export class EnumDefinition extends SymbolVisitor {
   public ruleKind = RuleKind.EnumDefinition;
   public symbolKind = SymbolKind.Enum;
-  public nameToken = [FieldName.Name, TokenKind.Identifier] as const;
+  public nameToken = [NodeLabel.Name, TokenKind.Identifier] as const;
 }

server/src/services/documentSymbol/visitors/ErrorDefinition.ts

@@ -1,9 +1,9 @@
 import { SymbolKind } from "vscode-languageserver-types";
-import { RuleKind, TokenKind, FieldName } from "@nomicfoundation/slang/kinds";
+import { RuleKind, TokenKind, NodeLabel } from "@nomicfoundation/slang/kinds";
 import { SymbolVisitor } from "../SymbolVisitor";
 
 export class ErrorDefinition extends SymbolVisitor {
   public ruleKind = RuleKind.ErrorDefinition;
   public symbolKind = SymbolKind.Event;
-  public nameToken = [FieldName.Name, TokenKind.Identifier] as const;
+  public nameToken = [NodeLabel.Name, TokenKind.Identifier] as const;
 }