preparation for setting xpath variables in evaluation context

Author: pgfearo

src/extension.ts

@@ -8,13 +8,13 @@
  *  DeltaXML Ltd. - XPath/XSLT Lexer/Syntax Highlighter
  */
 import * as vscode from 'vscode';
-import { XPathLexer, ExitCondition, LexPosition, Token } from './xpLexer';
+import { XPathLexer, ExitCondition, LexPosition, Token, BaseToken } from './xpLexer';
 import { XMLDocumentFormattingProvider } from './xmlDocumentFormattingProvider';
 import { SaxonTaskProvider } from './saxonTaskProvider';
 import { SaxonJsTaskProvider } from './saxonJsTaskProvider';
 import { XSLTConfiguration, XPathConfiguration, XMLConfiguration, XSLTLightConfiguration, DCPConfiguration, SchConfiguration } from './languageConfigurations';
 import { SelectionType, XsltSymbolProvider } from './xsltSymbolProvider';
-import { XslLexer, LanguageConfiguration, DocumentTypes } from './xslLexer';
+import { XslLexer, LanguageConfiguration, DocumentTypes, GlobalInstructionData, GlobalInstructionType } from './xslLexer';
 import { DocumentChangeHandler } from './documentChangeHandler';
 import { on } from 'process';
 import { XsltDefinitionProvider } from './xsltDefinitionProvider';
@@ -257,13 +257,41 @@ export function activate(context: vscode.ExtensionContext) {
 
 }
 
-class XPathSemanticTokensProvider implements vscode.DocumentSemanticTokensProvider {
+export class XPathSemanticTokensProvider implements vscode.DocumentSemanticTokensProvider {
 	private xpLexer = new XPathLexer();
 	private collection: vscode.DiagnosticCollection;
 	public constructor(collection: vscode.DiagnosticCollection) {
 		this.collection = collection;
 	}
 
+	private static globalInstructionData: GlobalInstructionData[] = [];
+
+	public static getGlobalInstructionData() {
+		return XPathSemanticTokensProvider.globalInstructionData;
+	}
+
+	public static setVariableNames = (names: string[]) => {
+		const data: GlobalInstructionData[] = [];
+
+		names.forEach((name) => {
+			const token: BaseToken = {
+				line: 1,
+				startCharacter: 0,
+				length: 1,
+				value: name,
+				tokenType: 0
+			}
+			const variableInstruction: GlobalInstructionData = {
+				type: GlobalInstructionType.Variable,
+				name: name,
+				token: token,
+				idNumber: 0
+			}
+			data.push(variableInstruction);
+		});
+		XPathSemanticTokensProvider.globalInstructionData = data;
+	}
+
 	async provideDocumentSemanticTokens(document: vscode.TextDocument, token: vscode.CancellationToken): Promise<vscode.SemanticTokens> {
 		const lexPosition: LexPosition = { line: 0, startCharacter: 0, documentOffset: 0 };
 		this.xpLexer.documentTokens = [];
@@ -277,7 +305,7 @@ class XPathSemanticTokensProvider implements vscode.DocumentSemanticTokensProvid
 	}
 
 	private reportProblems(allTokens: Token[], document: vscode.TextDocument) {
-		let diagnostics = XsltTokenDiagnostics.calculateDiagnostics(XPathConfiguration.configuration, DocumentTypes.XPath, document, allTokens, DocumentChangeHandler.lastXMLDocumentGlobalData, [], []);
+		let diagnostics = XsltTokenDiagnostics.calculateDiagnostics(XPathConfiguration.configuration, DocumentTypes.XPath, document, allTokens, DocumentChangeHandler.lastXMLDocumentGlobalData, XPathSemanticTokensProvider.globalInstructionData, []);
 		if (diagnostics.length > 0) {
 			this.collection.set(document.uri, diagnostics);
 		} else {

src/testper.xsl

@@ -7,7 +7,8 @@ import { XsltTokenCompletions } from './xsltTokenCompletions';
 import { XSLTSchema, SchemaData } from './xsltSchema';
 import { SchemaQuery } from './schemaQuery';
 import { XsltPackage, XsltSymbolProvider } from './xsltSymbolProvider';
-import { ExitCondition, LexPosition, XPathLexer } from './xpLexer';
+import { BaseToken, ExitCondition, LexPosition, XPathLexer } from './xpLexer';
+import { XPathSemanticTokensProvider } from './extension';
 
 interface ImportedGlobals {
 	href: string,
@@ -47,11 +48,16 @@ export class XsltDefinitionProvider implements vscode.DefinitionProvider, vscode
 	public async provideDefinition(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken): Promise<vscode.Location | undefined> {
 		const lexPosition: LexPosition = { line: 0, startCharacter: 0, documentOffset: 0 };
 
-		let allTokens = this.docType === DocumentTypes.XPath ?
-			this.getXPLexer().analyse(document.getText(), ExitCondition.None, lexPosition) :
-			this.xslLexer.analyse(document.getText());
+		let allTokens: BaseToken[] = [];
+		let globalInstructionData: GlobalInstructionData[] = [];
+		if (this.docType === DocumentTypes.XPath) {
+			allTokens = this.getXPLexer().analyse(document.getText(), ExitCondition.None, lexPosition);
+			globalInstructionData = XPathSemanticTokensProvider.getGlobalInstructionData();
+		} else {
+			allTokens = this.xslLexer.analyse(document.getText());
+			globalInstructionData = this.xslLexer.globalInstructionData;
+		}
 
-		const globalInstructionData = this.xslLexer.globalInstructionData;
 		const xsltPackages: XsltPackage[] = <XsltPackage[]>vscode.workspace.getConfiguration('XSLT.resources').get('xsltPackages');
 
 		// Import/include XSLT - ensuring no duplicates
@@ -100,11 +106,17 @@ export class XsltDefinitionProvider implements vscode.DefinitionProvider, vscode
 	public async provideCompletionItems(document: vscode.TextDocument, position: vscode.Position, token: vscode.CancellationToken, context: vscode.CompletionContext): Promise<vscode.CompletionItem[] | undefined> {
 		const keepNameTests = true;
 		const lexPosition: LexPosition = { line: 0, startCharacter: 0, documentOffset: 0 };
+
+		let allTokens: BaseToken[] = [];
+		let globalInstructionData: GlobalInstructionData[] = [];
+		if (this.docType === DocumentTypes.XPath) {
+			allTokens = this.getXPLexer().analyse(document.getText(), ExitCondition.None, lexPosition);
+			globalInstructionData = XPathSemanticTokensProvider.getGlobalInstructionData();
+		} else {
+			allTokens = this.xslLexer.analyse(document.getText(), keepNameTests);
+			globalInstructionData = this.xslLexer.globalInstructionData;
+		}
 
-		let allTokens = this.docType === DocumentTypes.XPath ?
-			this.getXPLexer().analyse(document.getText(), ExitCondition.None, lexPosition) :
-			this.xslLexer.analyse(document.getText(), keepNameTests);
-		const globalInstructionData = this.xslLexer.globalInstructionData;
 		const xsltPackages: XsltPackage[] = <XsltPackage[]>vscode.workspace.getConfiguration('XSLT.resources').get('xsltPackages');
 
 		// Import/include XSLT - ensuring no duplicates

src/xsltDefinitionProvider.ts

@@ -328,10 +328,6 @@ export class XsltTokenDiagnostics {
 			}
 		});
 
-		if (docType === DocumentTypes.XPath) {
-			importedGlobalVarNames.push('_');
-		}
-
 		importedInstructionData.forEach((instruction) => {
 			switch (instruction.type) {
 				case GlobalInstructionType.Variable: