Different workaround for microsoft/TypeScript#12083

Author: aeschli

src/parser/cssNodes.ts

@@ -371,6 +371,7 @@ export class Node {
 }
 
 export class Nodelist extends Node {
+	private _nodeList: void; // workaround for https://github.com/Microsoft/TypeScript/issues/12083
 
 	constructor(parent: Node, index: number = -1) {
 		super(-1, -1);
@@ -470,6 +471,8 @@ export class RuleSet extends BodyDeclaration {
 
 export class Selector extends Node {
 
+	private _selector: void; // workaround for https://github.com/Microsoft/TypeScript/issues/12083
+
 	constructor(offset: number, length: number) {
 		super(offset, length);
 	}
@@ -482,6 +485,8 @@ export class Selector extends Node {
 
 export class SimpleSelector extends Node {
 
+	private _simpleSelector: void; // workaround for https://github.com/Microsoft/TypeScript/issues/12083
+
 	constructor(offset: number, length: number) {
 		super(offset, length);
 	}
@@ -990,6 +995,8 @@ export class PageBoxMarginBox extends BodyDeclaration {
 
 export class Expression extends Node {
 
+	private _expression: void; // workaround for https://github.com/Microsoft/TypeScript/issues/12083
+
 	constructor(offset: number, length: number) {
 		super(offset, length);
 	}

src/parser/cssParser.ts

@@ -132,8 +132,7 @@ export class Parser {
 			if (this.prevToken !== null) {
 				// length with more elements belonging together
 				let prevEnd = this.prevToken.offset + this.prevToken.len;
-				let node2 = <nodes.Node> node; // workaround for https://github.com/Microsoft/TypeScript/issues/12083
-				node2.length = prevEnd > node2.offset ? prevEnd - node2.offset : 0; // offset is taken from current token, end from previous: Use 0 for empty nodes
+				node.length = prevEnd > node.offset ? prevEnd - node.offset : 0; // offset is taken from current token, end from previous: Use 0 for empty nodes
 			}
 
 		}

src/services/cssCompletion.ts

@@ -47,14 +47,15 @@ export class CSSCompletion {
 
 			for (let i = this.nodePath.length - 1; i >= 0; i--) {
 				let node = this.nodePath[i];
-				let node2 = node; // workaround for https://github.com/Microsoft/TypeScript/issues/12083
 				if (node instanceof nodes.Property) {
 					this.getCompletionsForDeclarationProperty(node.getParent() as nodes.Declaration, result);
 				} else if (node instanceof nodes.Expression) {
 					this.getCompletionsForExpression(<nodes.Expression>node, result);
 				} else if (node instanceof nodes.SimpleSelector) {
-					let parentRuleSet = <nodes.RuleSet>node2.findParent(nodes.NodeType.Ruleset);
+					let parentRuleSet = <nodes.RuleSet>node.findParent(nodes.NodeType.Ruleset);
 					this.getCompletionsForSelector(parentRuleSet, result);
+				} else if (node instanceof nodes.FunctionArgument) {
+					this.getCompletionsForFunctionArgument(<nodes.FunctionArgument>node, <nodes.Function>node.getParent(), result);
 				} else if (node instanceof nodes.Declarations) {
 					this.getCompletionsForDeclarations(<nodes.Declarations>node, result);
 				} else if (node instanceof nodes.VariableDeclaration) {
@@ -63,8 +64,6 @@ export class CSSCompletion {
 					this.getCompletionsForRuleSet(<nodes.RuleSet>node, result);
 				} else if (node instanceof nodes.Interpolation) {
 					this.getCompletionsForInterpolation(<nodes.Interpolation>node, result);
-				} else if (node instanceof nodes.FunctionArgument) {
-					this.getCompletionsForFunctionArgument(<nodes.FunctionArgument>node, <nodes.Function>node2.getParent(), result);
 				} else if (node instanceof nodes.FunctionDeclaration) {
 					this.getCompletionsForFunctionDeclaration(<nodes.FunctionDeclaration>node, result);
 				} else if (node instanceof nodes.Function) {
@@ -148,7 +147,7 @@ export class CSSCompletion {
 	public getCompletionsForDeclarationValue(node: nodes.Declaration, result: CompletionList): CompletionList {
 		let propertyName = node.getFullPropertyName();
 		let entry = languageFacts.getProperties()[propertyName];
-		let existingNode = node.getValue();
+		let existingNode: nodes.Node = node.getValue();
 
 		while (existingNode && existingNode.hasChildren()) {
 			existingNode = existingNode.findChildAtOffset(this.offset, false);

src/services/cssHover.ts

@@ -38,7 +38,7 @@ export class CSSHover {
 				};
 			}
 			if (node instanceof nodes.Declaration) {
-				let propertyName = (<nodes.Declaration> node).getFullPropertyName(); // workaround for https://github.com/Microsoft/TypeScript/issues/12083
+				let propertyName = node.getFullPropertyName();
 				let entry = languageFacts.getProperties()[propertyName];
 				if (entry) {
 					let contents : MarkedString[] = [];

src/services/selectorPrinting.ts

@@ -308,8 +308,7 @@ class SelectorElementBuilder {
 		selector.getChildren().forEach(selectorChild => {
 
 			if (selectorChild instanceof nodes.SimpleSelector) {
-				let prev2 = this.prev; // workaround for https://github.com/Microsoft/TypeScript/issues/12083
-				if (prev2 instanceof nodes.SimpleSelector) {
+				if (this.prev instanceof nodes.SimpleSelector) {
 					let labelElement = new LabelElement('\u2026');
 					this.element.addChild(labelElement);
 					this.element = labelElement;
@@ -328,8 +327,7 @@ class SelectorElementBuilder {
 				this.element.addChild(root);
 				this.element = thisElement;
 			}
-			var selectorChild2 = selectorChild; // workaround for https://github.com/Microsoft/TypeScript/issues/12083
-			if (selectorChild2 instanceof nodes.SimpleSelector ||
+			if (selectorChild instanceof nodes.SimpleSelector ||
 				selectorChild.type === nodes.NodeType.SelectorCombinatorParent ||
 				selectorChild.type === nodes.NodeType.SelectorCombinatorSibling ||
 				selectorChild.type === nodes.NodeType.SelectorCombinatorAllSiblings) {
@@ -372,7 +370,7 @@ export function selectorToElement(node: nodes.Selector): Element {
 	let builder = new SelectorElementBuilder(root);
 
 	for (let i = parentRuleSets.length - 1; i >= 0; i--) {
-		let selector = parentRuleSets[i].getSelectors().getChild(0);
+		let selector = <nodes.Selector> parentRuleSets[i].getSelectors().getChild(0);
 		if (selector) {
 			builder.processSelector(selector);
 		}