Upgrade to antlr4ng. Everything is broken!

Author: SSlinky

server/src/capabilities/semanticTokens.ts

@@ -49,7 +49,7 @@ export class SemanticToken {
 			element,
 			element.identifier.range.start.line,
 			element.identifier.range.start.character,
-			element.identifier.context.text.length,
+			element.identifier.context.getText().length,
 			element.tokenType,
 			element.tokenModifiers
 		);

server/src/extensions/parserExtensions.ts

@@ -1,5 +1,4 @@
 import { Range, SymbolKind } from 'vscode-languageserver';
-import { BaseTypeContext, ComplexTypeContext } from '../antlr/out/vbaParser';
 import { TextDocument } from 'vscode-languageserver-textdocument';
 // import { ParserRuleContext } from 'antlr4ts';
 
@@ -21,44 +20,44 @@ import { TextDocument } from 'vscode-languageserver-textdocument';
 // };
 
 
-declare module '../antlr/out/vbaParser' {
-	export interface BaseTypeContext {
-		toSymbolKind(): SymbolKind;
-	}
+// declare module '../antlr/out/vbaParser' {
+// 	export interface BaseTypeContext {
+// 		toSymbolKind(): SymbolKind;
+// 	}
 
-   export interface ComplexTypeContext {
-		toSymbolKind(): SymbolKind;
-	}
-}
+//    export interface ComplexTypeContext {
+// 		toSymbolKind(): SymbolKind;
+// 	}
+// }
 
-BaseTypeContext.prototype.toSymbolKind = function (): SymbolKind {
-   return toSymbolKind(this);
-};
+// BaseTypeContext.prototype.toSymbolKind = function (): SymbolKind {
+//    return toSymbolKind(this);
+// };
 
-ComplexTypeContext.prototype.toSymbolKind = function (): SymbolKind {
-   return toSymbolKind(this);
-};
+// ComplexTypeContext.prototype.toSymbolKind = function (): SymbolKind {
+//    return toSymbolKind(this);
+// };
 
-function toSymbolKind(context: BaseTypeContext | ComplexTypeContext): SymbolKind {
-	switch (context.text.toLocaleLowerCase()) {
-		case 'boolean':
-			return SymbolKind.Boolean;
-		case 'byte':
-		case 'string':
-			return SymbolKind.String;
-		case 'double':
-		case 'currency':
-      case 'integer':
-		case 'long':
-		case 'longPtr':
-		case 'longLong':
-			return SymbolKind.Number;
-		case 'object':
-			return SymbolKind.Object;
-		default:
-			return SymbolKind.Class;
-	}
-}
+// function toSymbolKind(context: BaseTypeContext | ComplexTypeContext): SymbolKind {
+// 	switch (context.text.toLocaleLowerCase()) {
+// 		case 'boolean':
+// 			return SymbolKind.Boolean;
+// 		case 'byte':
+// 		case 'string':
+// 			return SymbolKind.String;
+// 		case 'double':
+// 		case 'currency':
+//       case 'integer':
+// 		case 'long':
+// 		case 'longPtr':
+// 		case 'longLong':
+// 			return SymbolKind.Number;
+// 		case 'object':
+// 			return SymbolKind.Object;
+// 		default:
+// 			return SymbolKind.Class;
+// 	}
+// }
 
 /**
  *  const File: 1;

server/src/project/document.ts

@@ -1,7 +1,7 @@
 import { CancellationToken, Diagnostic, LSPErrorCodes, PublishDiagnosticsParams, ResponseError, SemanticTokens, SymbolInformation, SymbolKind } from 'vscode-languageserver';
 import { Workspace } from './workspace';
 import { FoldableElement } from './elements/special';
-import { BaseSyntaxElement, HasAttribute, HasDiagnosticCapability, HasSemanticToken, HasSymbolInformation } from './elements/base';
+import { BaseSyntaxElement, HasDiagnosticCapability, HasSemanticToken, HasSymbolInformation, ScopeElement } from './elements/base';
 import { Range, TextDocument } from 'vscode-languageserver-textdocument';
 import { SyntaxParser } from './parser/vbaSyntaxParser';
 import { FoldingRange } from '../capabilities/folding';
@@ -10,18 +10,18 @@ import { sleep } from '../utils/helpers';
 
 
 export abstract class BaseProjectDocument {
+	readonly name: string;
 	readonly workspace: Workspace;
 	readonly textDocument: TextDocument;
-	readonly name: string;
 
+	protected _hasDiagnosticElements: HasDiagnosticCapability[] = [];
 	protected _unhandledNamedElements: [] = [];
 	protected _publicScopeDeclarations: Map<string, any> = new Map();
 	protected _documentScopeDeclarations: Map<string, Map<string, any>> = new Map();
-	protected _hasDiagnosticElements: HasDiagnosticCapability[] = [];
 
 	protected _diagnostics: Diagnostic[] = [];
-	protected _elementParents: BaseSyntaxElement[] = [];
-	protected _attributeElements: HasAttribute[] = [];
+	protected _elementParents: ScopeElement[] = [];
+	// protected _attributeElements: HasAttribute[] = [];
 	protected _foldableElements: FoldingRange[] = [];
 	protected _symbolInformations: SymbolInformation[] = [];
 	protected _semanticTokens: SemanticTokensManager = new SemanticTokensManager();
@@ -33,10 +33,14 @@ export abstract class BaseProjectDocument {
 		return this._isBusy;
 	}
 
-	get activeAttributeElement() {
-		return this._attributeElements?.at(-1);
+	get currentScopeElement() {
+		return this._elementParents[-1];
 	}
 
+	// get activeAttributeElement() {
+	// 	return this._attributeElements?.at(-1);
+	// }
+
 	constructor(workspace: Workspace, name: string, document: TextDocument) {
 		this.textDocument = document;
 		this.workspace = workspace;
@@ -121,10 +125,10 @@ export abstract class BaseProjectDocument {
 	 * @param element the element to register.
 	 * @returns nothing of interest.
 	 */
-	registerAttributeElement = (element: HasAttribute) => {
-		this._attributeElements.push(element);
-		return this;
-	};
+	// registerAttributeElement = (element: HasAttribute) => {
+	// 	this._attributeElements.push(element);
+	// 	return this;
+	// };
 
 	/**
 	 * Pops an element from the attribute elements stack.
@@ -133,9 +137,9 @@ export abstract class BaseProjectDocument {
 	 * @param element the element to register.
 	 * @returns the element at the end of the stack.
 	 */
-	deregisterAttributeElement = () => {
-		return this._attributeElements.pop();
-	};
+	// deregisterAttributeElement = () => {
+	// 	return this._attributeElements.pop();
+	// };
 
 	registerFoldableElement = (element: FoldableElement) => {
 		this._foldableElements.push(new FoldingRange(element));
@@ -153,7 +157,7 @@ export abstract class BaseProjectDocument {
 	 * @param element the element to register.
 	 * @returns this for chaining.
 	 */
-	registerScopedElement(element: BaseSyntaxElement) {
+	registerScopedElement(element: ScopeElement) {
 		this._elementParents.push(element);
 		return this;
 	}

server/src/project/elements/base.ts

@@ -1,9 +1,8 @@
-import { ParserRuleContext } from 'antlr4ts';
+import { ParserRuleContext } from 'antlr4ng';
 import { Diagnostic, Range, SemanticTokenModifiers, SemanticTokenTypes, SymbolInformation, SymbolKind } from 'vscode-languageserver';
 import { Position, TextDocument } from 'vscode-languageserver-textdocument';
 import { FoldingRangeKind } from '../../capabilities/folding';
 import { IdentifierElement } from './memory';
-import { AttributeStmtContext } from '../../antlr/out/vbaParser';
 import '../../extensions/parserExtensions';
 
 export interface ContextOptionalSyntaxElement {
@@ -26,10 +25,6 @@ export interface HasDiagnosticCapability {
 	evaluateDiagnostics(): void;
 }
 
-export interface HasAttribute {
-	processAttribute(context: AttributeStmtContext): void;
-}
-
 export interface NamedSyntaxElement extends SyntaxElement {
 	get name(): string;
 }
@@ -58,14 +53,18 @@ export interface FoldingRangeElement {
 	foldingRangeKind?: FoldingRangeKind;
 }
 
+export interface ScopeElement {
+	declaredNames: Map<string, BaseSyntaxElement>;
+}
+
 export abstract class BaseSyntaxElement implements ContextOptionalSyntaxElement {
 	protected document: TextDocument;
 
 	range?: Range;
 	parent?: ContextOptionalSyntaxElement;
 	context?: ParserRuleContext;
 
-	get text(): string { return this.context?.text ?? ''; }
+	get text(): string { return this.context?.getText() ?? ''; }
 	get uri(): string { return this.document.uri; }
 
 	constructor(context: ParserRuleContext | undefined, document: TextDocument) {
@@ -91,8 +90,8 @@ export abstract class BaseSyntaxElement implements ContextOptionalSyntaxElement
 			return;
 		}
 
-		const startIndex = this.context.start.startIndex;
-		const stopIndex = this.context.stop?.stopIndex ?? startIndex;
+		const startIndex = this.context?.start?.start ?? 0;
+		const stopIndex = this.context.stop?.stop ?? startIndex;
 		return Range.create(
 			this.document.positionAt(startIndex),
 			this.document.positionAt(stopIndex + 1)
@@ -107,4 +106,4 @@ export abstract class BaseContextSyntaxElement extends BaseSyntaxElement {
 	constructor(ctx: ParserRuleContext, doc: TextDocument) {
 		super(ctx, doc);
 	}
-}
+}

server/src/project/elements/flow.ts

@@ -1,7 +1,6 @@
-import { ParserRuleContext } from 'antlr4ts';
+import { ParserRuleContext } from 'antlr4ng';
 import { BaseContextSyntaxElement, HasDiagnosticCapability } from './base';
 import { TextDocument } from 'vscode-languageserver-textdocument';
-import { ValueStmtContext, WhileWendStmtContext } from '../../antlr/out/vbaParser';
 import { Diagnostic } from 'vscode-languageserver';
 import { WhileWendDeprecatedDiagnostic } from '../../capabilities/diagnostics';
 
@@ -13,22 +12,22 @@ class BaseLoopElement extends BaseContextSyntaxElement {
 }
 
 
-export class WhileWendLoopElement extends BaseLoopElement implements HasDiagnosticCapability {
-	diagnostics: Diagnostic[] = [];
-	valueStatement: ValueStatementElement;
+// export class WhileWendLoopElement extends BaseLoopElement implements HasDiagnosticCapability {
+// 	diagnostics: Diagnostic[] = [];
+// 	valueStatement: ValueStatementElement;
 
-	constructor(context: WhileWendStmtContext, document: TextDocument) {
-		super(context, document);
-		this.valueStatement = new ValueStatementElement(context.valueStmt(), document);
-	}
+// 	constructor(context: WhileWendStmtContext, document: TextDocument) {
+// 		super(context, document);
+// 		this.valueStatement = new ValueStatementElement(context.valueStmt(), document);
+// 	}
 
-	evaluateDiagnostics(): void {
-		this.diagnostics.push(new WhileWendDeprecatedDiagnostic(this.valueStatement.range));
-	}
-}
+// 	evaluateDiagnostics(): void {
+// 		this.diagnostics.push(new WhileWendDeprecatedDiagnostic(this.valueStatement.range));
+// 	}
+// }
 
-class ValueStatementElement extends BaseContextSyntaxElement {
-	constructor(context: ValueStmtContext, document: TextDocument) {
-		super(context, document);
-	}
-}
+// class ValueStatementElement extends BaseContextSyntaxElement {
+// 	constructor(context: ValueStmtContext, document: TextDocument) {
+// 		super(context, document);
+// 	}
+// }