[add] indirection

.gitignore

@@ -1,3 +1,4 @@
+client/.antlr
 test.bf
 out
 dist

.vscode/settings.json

@@ -4,6 +4,6 @@
 	"typescript.tsc.autoDetect": "off",
 	"typescript.preferences.quoteStyle": "single",
 	"editor.codeActionsOnSave": {
-		"source.fixAll.eslint": true
+		"source.fixAll.eslint": "explicit"
 	}
 }

server/src/connection.ts

@@ -0,0 +1,108 @@
+import { CompletionItem, CompletionItemKind, Connection, DidChangeConfigurationNotification, DidChangeConfigurationParams, InitializeParams, InitializeResult, TextDocumentPositionParams, TextDocumentSyncKind } from 'vscode-languageserver';
+
+export class BranFlakesConnectionManager {
+	hasConfigurationCapability: boolean = false;
+	hasWorkspaceFolderCapability: boolean = false;
+	hasDiagnosticRelatedInformationCapability: boolean = false;
+
+	constructor(protected connection: Connection) {
+		connection.onInitialize(this.initConnection);
+	}
+
+	initConnection(params: InitializeParams) {
+		let capabilities = params.capabilities;
+
+		// Does the client support the `workspace/configuration` request?
+		// If not, we will fall back using global settings
+		this.hasConfigurationCapability = !!(
+			capabilities.workspace && !!capabilities.workspace.configuration
+		);
+		this.hasWorkspaceFolderCapability = !!(
+			capabilities.workspace && !!capabilities.workspace.workspaceFolders
+		);
+		this.hasDiagnosticRelatedInformationCapability = !!(
+			capabilities.textDocument &&
+			capabilities.textDocument.publishDiagnostics &&
+			capabilities.textDocument.publishDiagnostics.relatedInformation
+		);
+
+		const result: InitializeResult = {
+			capabilities: {
+				textDocumentSync: TextDocumentSyncKind.Incremental,
+				// Tell the client that the server supports code completion
+				completionProvider: {
+					resolveProvider: false,
+					triggerCharacters: ['.'],
+				},
+			},
+		};
+		if (this.hasWorkspaceFolderCapability) {
+			result.capabilities.workspace = {
+				workspaceFolders: {
+					supported: true,
+				},
+			};
+		}
+		return result;
+	}
+	onInit() {
+		if (this.hasConfigurationCapability) {
+			// Register for all configuration changes.
+			this.connection.client.register(
+				DidChangeConfigurationNotification.type,
+				undefined
+			);
+		}
+		if (this.hasWorkspaceFolderCapability) {
+			this.connection.workspace.onDidChangeWorkspaceFolders(_event => {
+				// connection.console.log('Workspace folder change event received.');
+			});
+		}
+	}
+
+	setOnCompletion() {
+		this.connection.onCompletion((_textDocumentPosition: TextDocumentPositionParams): CompletionItem[] => {
+			const completions: CompletionItem[] = [
+				{
+					label: '+',
+					detail: 'Addition',
+					documentation: 'Add one to cell',
+				},
+				{
+					label: '-',
+					detail: 'Subtraction',
+					documentation: 'Subtract one from cell',
+				},
+				{
+					label: ',',
+					detail: 'Input',
+					documentation: 'Ask for input (Stored in the ASCII format)',
+				},
+				{
+					label: '.',
+					detail: 'Output',
+					documentation: 'Output the equivalent ASCII character',
+				},
+				{
+					label: '>',
+					detail: 'Right Shift',
+					documentation: 'Shift the pointer one cell to the right',
+				},
+				{
+					label: '<',
+					detail: 'Left Shift',
+					documentation: 'Shift the pointer one cell to the Left',
+				},
+			];
+			return completions.map(e => {
+				e.kind = CompletionItemKind.Operator;
+				return e;
+			});
+		});
+	}
+
+	listen() {
+		this.connection.listen();
+	}
+
+}

server/src/server.ts

@@ -5,104 +5,38 @@
 import {
 	createConnection,
 	TextDocuments,
-    Diagnostic,
-    DiagnosticSeverity,
 	ProposedFeatures,
-    InitializeParams,
-    DidChangeConfigurationNotification,
-    CompletionItem,
-    CompletionItemKind,
-    TextDocumentPositionParams,
-    TextDocumentSyncKind,
-    InitializeResult,
 } from 'vscode-languageserver';
 
 import { TextDocument } from 'vscode-languageserver-textdocument';
+import { BranFlakesSettings, defaultSettings } from './settings';
+import { BranFlakesConnectionManager } from './connection';
+import { validateTextDocument } from './validation';
 
 // Create a connection for the server. The connection uses Node's IPC as a transport.
 // Also include all preview / proposed LSP features.
-let connection = createConnection(ProposedFeatures.all);
+export let connection = createConnection(ProposedFeatures.all);
 
 // Create a simple text document manager. The text document manager
 // supports full document sync only
 let documents: TextDocuments<TextDocument> = new TextDocuments(TextDocument);
 
 let hasConfigurationCapability: boolean = false;
-let hasWorkspaceFolderCapability: boolean = false;
-let hasDiagnosticRelatedInformationCapability: boolean = false;
 
-connection.onInitialize((params: InitializeParams) => {
+let cm = new BranFlakesConnectionManager(connection);
-    let capabilities = params.capabilities;
 
-    // Does the client support the `workspace/configuration` request?
-    // If not, we will fall back using global settings
-    hasConfigurationCapability = !!(
-        capabilities.workspace && !!capabilities.workspace.configuration
-    );
-    hasWorkspaceFolderCapability = !!(
-        capabilities.workspace && !!capabilities.workspace.workspaceFolders
-    );
-    hasDiagnosticRelatedInformationCapability = !!(
-        capabilities.textDocument &&
-        capabilities.textDocument.publishDiagnostics &&
-        capabilities.textDocument.publishDiagnostics.relatedInformation
-    );
 
-    const result: InitializeResult = {
+let globalSettings: BranFlakesSettings = defaultSettings;
-        capabilities: {
-            textDocumentSync: TextDocumentSyncKind.Incremental,
-            // Tell the client that the server supports code completion
-            completionProvider: {
-                resolveProvider: false,
-                triggerCharacters: ['.'],
-            },
-        },
-    };
-    if (hasWorkspaceFolderCapability) {
-        result.capabilities.workspace = {
-            workspaceFolders: {
-                supported: true,
-            },
-        };
-    }
-    return result;
-});
-
-connection.onInitialized(() => {
-    if (hasConfigurationCapability) {
-        // Register for all configuration changes.
-        connection.client.register(
-            DidChangeConfigurationNotification.type,
-            undefined
-        );
-    }
-    if (hasWorkspaceFolderCapability) {
-        connection.workspace.onDidChangeWorkspaceFolders(_event => {
-            connection.console.log('Workspace folder change event received.');
-        });
-    }
-});
-
-// The example settings
-interface ExampleSettings {
-    maxNumberOfProblems: number;
-}
-
-// The global settings, used when the `workspace/configuration` request is not supported by the client.
-// Please note that this is not the case when using this server with the client provided in this example
-// but could happen with other clients.
-const defaultSettings: ExampleSettings = { maxNumberOfProblems: 5 };
-let globalSettings: ExampleSettings = defaultSettings;
 
 // Cache the settings of all open documents
-let documentSettings: Map<string, Thenable<ExampleSettings>> = new Map();
+let documentSettings: Map<string, Thenable<BranFlakesSettings>> = new Map();
 
 connection.onDidChangeConfiguration(change => {
 	if (hasConfigurationCapability) {
 		// Reset all cached document settings
 		documentSettings.clear();
 	} else {
-        globalSettings = <ExampleSettings>(
+		globalSettings = <BranFlakesSettings>(
             (change.settings.languageServerExample || defaultSettings)
         );
 	}
@@ -113,7 +47,7 @@ connection.onDidChangeConfiguration(change => {
 	});
 });
 
-function getDocumentSettings(resource: string): Thenable<ExampleSettings> {
+export function getDocumentSettings(resource: string): Thenable<BranFlakesSettings> {
 	if (!hasConfigurationCapability) {
 		return Promise.resolve(globalSettings);
 	}
@@ -144,99 +78,12 @@ documents.onDidSave(change => {
 	validateTextDocument(change.document);
 });
 
-const validateBrackets = (text: string) => {
-    let count = 0,
-        lp: number[] = [],
-        issues: number[] = [];
-    const textsplit = text.split('');
-    textsplit.forEach((x, i) => {
-        if (x === '[' || x === ']') {
-            if (x === '[') {
-                lp.push(i);
-            }
-            if (x === ']') {
-                if (lp.length === 0) {
-                    issues.push(i);
-                }
-                lp.pop();
-            }
-        }
-    });
-
-    return [...lp, ...issues];
-};
-
-async function validateTextDocument(textDocument: TextDocument): Promise<void> {
-    // In this simple example we get the settings for every validate run.
-    let settings = await getDocumentSettings(textDocument.uri);
-    // The validator creates diagnostics for all uppercase words length 2 and more
-    const text = textDocument.getText();
-
-    let problems = 0;
-    let diagnostics: Diagnostic[] = [];
-    const issues = validateBrackets(text);
-
-    diagnostics.push(
-        ...issues.map<Diagnostic>(e => ({
-            message: 'Brackets unmatched',
-            range: {
-                start: textDocument.positionAt(e),
-                end: textDocument.positionAt(e + 1),
-            },
-            severity: DiagnosticSeverity.Error,
-            code: '[ and ]',
-        }))
-    );
-
-    // Send the computed diagnostics to VSCode.
-    connection.sendDiagnostics({ uri: textDocument.uri, diagnostics });
-}
-
 // This handler provides the initial list of the completion items.
-connection.onCompletion(
+cm.setOnCompletion();
-    (_textDocumentPosition: TextDocumentPositionParams): CompletionItem[] => {
-        const completions: CompletionItem[] = [
-            {
-                label: '+',
-                detail: 'Addition',
-                documentation: 'Add one to cell',
-            },
-            {
-                label: '-',
-                detail: 'Subtraction',
-                documentation: 'Subtract one from cell',
-            },
-            {
-                label: ',',
-                detail: 'Input',
-                documentation: 'Ask for input (Stored in the ASCII format)',
-            },
-            {
-                label: '.',
-                detail: 'Output',
-                documentation: 'Output the equivalent ASCII character',
-            },
-            {
-                label: '>',
-                detail: 'Right Shift',
-                documentation: 'Shift the pointer one cell to the right',
-            },
-            {
-                label: '<',
-                detail: 'Left Shift',
-                documentation: 'Shift the pointer one cell to the Left',
-            },
-        ];
-        return completions.map(e => {
-            e.kind = CompletionItemKind.Operator;
-            return e;
-        });
-    }
-);
 
 // Make the text document manager listen on the connection
 // for open, change and close text document events
 documents.listen(connection);
 
 // Listen on the connection
-connection.listen();
+cm.listen();

server/src/settings.ts

@@ -0,0 +1,13 @@
+// The example settings
+export interface BranFlakesSettings {
+	maxNumberOfProblems: number;
+}
+
+
+// The global settings, used when the `workspace/configuration` request is not supported by the client.
+// Please note that this is not the case when using this server with the client provided in this example
+// but could happen with other clients.
+export const defaultSettings: BranFlakesSettings = { 
+	maxNumberOfProblems: 5 
+};
+

server/src/validation.ts

@@ -0,0 +1,52 @@
+import { Diagnostic, DiagnosticSeverity } from 'vscode-languageserver';
+import { TextDocument } from 'vscode-languageserver-textdocument';
+import { getDocumentSettings, connection } from './server';
+
+
+
+export const validateBrackets = (text: string) => {
+	let count = 0, lp: number[] = [], issues: number[] = [];
+	const textsplit = text.split('');
+	textsplit.forEach((x, i) => {
+		if (x === '[' || x === ']') {
+			if (x === '[') {
+				lp.push(i);
+			}
+			if (x === ']') {
+				if (lp.length === 0) {
+					issues.push(i);
+				}
+				lp.pop();
+			}
+		}
+	});
+
+	return [...lp, ...issues];
+};
+
+export async function validateTextDocument(textDocument: TextDocument): Promise<void> {
+	// In this simple example we get the settings for every validate run.
+	let settings = await getDocumentSettings(textDocument.uri);
+	// The validator creates diagnostics for all uppercase words length 2 and more
+	const text = textDocument.getText();
+
+	let problems = 0;
+	let diagnostics: Diagnostic[] = [];
+	const issues = validateBrackets(text);
+
+	diagnostics.push(
+		...issues.map<Diagnostic>(e => ({
+			message: 'Brackets unmatched',
+			range: {
+				start: textDocument.positionAt(e),
+				end: textDocument.positionAt(e + 1),
+			},
+			severity: DiagnosticSeverity.Error,
+			code: '[ and ]',
+		}))
+	);
+
+	// Send the computed diagnostics to VSCode.
+	connection.sendDiagnostics({ uri: textDocument.uri, diagnostics });
+}
+