Formatting changes

Author: chuckjaz

server/.vscode/settings.json

@@ -1,4 +1,6 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-  "typescript.tsdk": "./node_modules/typescript/lib"
+  "typescript.tsdk": "./node_modules/typescript/lib",
+  "editor.useTabStops": false,
+  "editor.tabSize": 2
 }

server/src/errors.ts

@@ -2,49 +2,49 @@ import {DiagnosticSeverity, IConnection, Range, TextDocumentIdentifier} from 'vs
 import {TextDocuments} from './documents';
 
 export class ErrorCollector {
-	private timer: NodeJS.Timer | undefined;
+  private timer: NodeJS.Timer | undefined;
 
-	constructor(
+  constructor(
     private documents: TextDocuments,
     private connection: IConnection,
     private initialDelay: number = 1500,
     private nextDelay: number = 20) {}
 
-	public requestErrors(...documents: TextDocumentIdentifier[]) {
-		if (this.timer) {
-			clearTimeout(this.timer);
-			this.timer = undefined;
-		}
-		let index = 0;
-		let process: () => void;
+  public requestErrors(...documents: TextDocumentIdentifier[]) {
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = undefined;
+    }
+    let index = 0;
+    let process: () => void;
 
-		process = () => {
-			this.timer = undefined;
-			this.sendErrorsFor(documents[index++]);
-			if (index < documents.length) this.timer = setTimeout(process, this.nextDelay);
-		}
-		this.timer = setTimeout(process, this.initialDelay);
-	}
+    process = () => {
+      this.timer = undefined;
+      this.sendErrorsFor(documents[index++]);
+      if (index < documents.length) this.timer = setTimeout(process, this.nextDelay);
+    }
+    this.timer = setTimeout(process, this.initialDelay);
+  }
 
-	private sendErrorsFor(document: TextDocumentIdentifier) {
-		const {fileName, service} = this.documents.getServiceInfo(document);
-		const diagnostics = service.getDiagnostics(fileName);
-		if (diagnostics) {
-			const offsets = ([] as number[]).concat(...diagnostics.map(d => [d.span.start, d.span.end]));
-			const positions = this.documents.offsetsToPositions(document, offsets);
-			const ranges: Range[] = [];
-			for (let i = 0; i < positions.length; i += 2) {
-				ranges.push(Range.create(positions[i], positions[i+1]));
-			}
-			this.connection.sendDiagnostics({
-				uri: document.uri,
-				diagnostics: diagnostics.map((diagnostic, i) => ({
-					range: ranges[i],
-					message: diagnostic.message,
-					severity: DiagnosticSeverity.Error,
+  private sendErrorsFor(document: TextDocumentIdentifier) {
+    const {fileName, service} = this.documents.getServiceInfo(document);
+    const diagnostics = service.getDiagnostics(fileName);
+    if (diagnostics) {
+      const offsets = ([] as number[]).concat(...diagnostics.map(d => [d.span.start, d.span.end]));
+      const positions = this.documents.offsetsToPositions(document, offsets);
+      const ranges: Range[] = [];
+      for (let i = 0; i < positions.length; i += 2) {
+        ranges.push(Range.create(positions[i], positions[i+1]));
+      }
+      this.connection.sendDiagnostics({
+        uri: document.uri,
+        diagnostics: diagnostics.map((diagnostic, i) => ({
+          range: ranges[i],
+          message: diagnostic.message,
+          severity: DiagnosticSeverity.Error,
           source: 'Angular'
-				}))
-			});
-		}
-	}
+        }))
+      });
+    }
+  }
 }

server/src/server.ts

@@ -8,11 +8,11 @@
 /// <reference path="../node_modules/@types/node/index.d.ts" />
 
 import {
-	IPCMessageReader, IPCMessageWriter,
-	createConnection, IConnection, TextDocumentSyncKind,
-	TextDocument, Diagnostic, DiagnosticSeverity,
-	InitializeParams, InitializeResult, TextDocumentPositionParams,
-	CompletionItem, CompletionItemKind, TextDocumentIdentifier, Range
+  IPCMessageReader, IPCMessageWriter,
+  createConnection, IConnection, TextDocumentSyncKind,
+  TextDocument, Diagnostic, DiagnosticSeverity,
+  InitializeParams, InitializeResult, TextDocumentPositionParams,
+  CompletionItem, CompletionItemKind, TextDocumentIdentifier, Range
 } from 'vscode-languageserver';
 
 import {TextDocuments, TextDocumentEvent} from './documents';
@@ -31,12 +31,12 @@ let documents: TextDocuments = new TextDocuments(handleTextEvent);
 const errorCollector = new ErrorCollector(documents, connection);
 
 function handleTextEvent(event: TextDocumentEvent) {
-	switch (event.kind) {
-		case 'context':
-		case 'change':
-		case 'opened':
-			errorCollector.requestErrors(event.document);
-	}
+  switch (event.kind) {
+    case 'context':
+    case 'change':
+    case 'opened':
+      errorCollector.requestErrors(event.document);
+  }
 }
 
 // Make the text document manager listen on the connection
@@ -47,45 +47,45 @@ documents.listen(connection);
 // in the passed params the rootPath of the workspace plus the client capabilites.
 let workspaceRoot: string;
 connection.onInitialize((params): InitializeResult => {
-	workspaceRoot = params.rootPath;
-	return {
-		capabilities: {
-			// Tell the client that the server works in FULL text document sync mode
-			textDocumentSync: documents.syncKind,
-			// Tell the client that the server support code complete
-			completionProvider: {
-				resolveProvider: false,
-				triggerCharacters: ['<', '.']
-			}
-		}
-	}
+  workspaceRoot = params.rootPath;
+  return {
+    capabilities: {
+      // Tell the client that the server works in FULL text document sync mode
+      textDocumentSync: documents.syncKind,
+      // Tell the client that the server support code complete
+      completionProvider: {
+        resolveProvider: false,
+        triggerCharacters: ['<', '.']
+      }
+    }
+  }
 });
 
 function compiletionKindToCompletionItemKind(kind: string): number {
-	switch (kind) {
-	case 'element': return CompletionItemKind.Class;
-	case 'attribute': return CompletionItemKind.Field;
-	case 'entity': return CompletionItemKind.Text;
-	case 'member': return CompletionItemKind.Property;
-	}
-	return CompletionItemKind.Text;
+  switch (kind) {
+  case 'element': return CompletionItemKind.Class;
+  case 'attribute': return CompletionItemKind.Field;
+  case 'entity': return CompletionItemKind.Text;
+  case 'member': return CompletionItemKind.Property;
+  }
+  return CompletionItemKind.Text;
 }
 
 // This handler provides the initial list of the completion items.
 connection.onCompletion((textDocumentPosition: TextDocumentPositionParams): CompletionItem[] => {
-	const {fileName, service, offset} = documents.getServiceInfo(textDocumentPosition.textDocument,
-		textDocumentPosition.position)
-	if (service) {
-		const result = service.getCompletionsAt(fileName, offset);
-		if (result) {
-			return result.map(completion => ({
-				label: completion.name,
-				kind: compiletionKindToCompletionItemKind(completion.kind),
-				detail: completion.kind,
-				sortText: completion.sort
-			}));
-		}
-	}
+  const {fileName, service, offset} = documents.getServiceInfo(textDocumentPosition.textDocument,
+    textDocumentPosition.position)
+  if (service) {
+    const result = service.getCompletionsAt(fileName, offset);
+    if (result) {
+      return result.map(completion => ({
+        label: completion.name,
+        kind: compiletionKindToCompletionItemKind(completion.kind),
+        detail: completion.kind,
+        sortText: completion.sort
+      }));
+    }
+  }
 });