Renaming utilties for clarity

ramya-rao-a · ramya-rao-a · commit bf634bf4e776 · 2017-07-24T14:45:02.000-07:00
diff --git a/extensions/emmet/src/abbreviationActions.ts b/extensions/emmet/src/abbreviationActions.ts
@@ -6,7 +6,7 @@
 import * as vscode from 'vscode';
 import { expand } from '@emmetio/expand-abbreviation';
 import { Node, HtmlNode, Rule } from 'EmmetNode';
-import { getNode, getInnerRange, getMappingForIncludedLanguages, parse, validate } from './util';
+import { getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, validate } from './util';
 import { getExpandOptions, extractAbbreviation, isStyleSheet, isAbbreviationValid, getEmmetMode } from 'vscode-emmet-helper';
 
 interface ExpandAbbreviationInput {
@@ -88,7 +88,7 @@ export function expandAbbreviation(args) {
 
 	const editor = vscode.window.activeTextEditor;
 
-	let rootNode = parse(editor.document);
+	let rootNode = parseDocument(editor.document);
 	if (!rootNode) {
 		return;
 	}
diff --git a/extensions/emmet/src/balance.ts b/extensions/emmet/src/balance.ts
@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { HtmlNode } from 'EmmetNode';
-import { getNode, parse, validate } from './util';
+import { getNode, parseDocument, validate } from './util';
 
 export function balanceOut() {
 	balance(true);
@@ -21,7 +21,7 @@ function balance(out: boolean) {
 		return;
 	}
 
-	let rootNode = <HtmlNode>parse(editor.document);
+	let rootNode = <HtmlNode>parseDocument(editor.document);
 	if (!rootNode) {
 		return;
 	}
diff --git a/extensions/emmet/src/defaultCompletionProvider.ts b/extensions/emmet/src/defaultCompletionProvider.ts
@@ -7,7 +7,7 @@ import * as vscode from 'vscode';
 import { HtmlNode } from 'EmmetNode';
 import { doComplete, isStyleSheet, getEmmetMode } from 'vscode-emmet-helper';
 import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
-import { getNode, getInnerRange, getMappingForIncludedLanguages, parse, getEmmetConfiguration } from './util';
+import { getNode, getInnerRange, getMappingForIncludedLanguages, parseDocument, getEmmetConfiguration } from './util';
 
 export class DefaultCompletionItemProvider implements vscode.CompletionItemProvider {
 
@@ -61,7 +61,7 @@ export class DefaultCompletionItemProvider implements vscode.CompletionItemProvi
 		if (!syntax) {
 			return syntax;
 		}
-		let rootNode = parse(document, false);
+		let rootNode = parseDocument(document, false);
 		if (!rootNode) {
 			return;
 		}
diff --git a/extensions/emmet/src/matchTag.ts b/extensions/emmet/src/matchTag.ts
@@ -5,15 +5,15 @@
 
 import * as vscode from 'vscode';
 import { HtmlNode } from 'EmmetNode';
-import { getNode, parse, validate } from './util';
+import { getNode, parseDocument, validate } from './util';
 
 export function matchTag() {
 	let editor = vscode.window.activeTextEditor;
 	if (!validate(false)) {
 		return;
 	}
 
-	let rootNode = <HtmlNode>parse(editor.document);
+	let rootNode = <HtmlNode>parseDocument(editor.document);
 	if (!rootNode) {
 		return;
 	}
diff --git a/extensions/emmet/src/mergeLines.ts b/extensions/emmet/src/mergeLines.ts
@@ -5,15 +5,15 @@
 
 import * as vscode from 'vscode';
 import { Node } from 'EmmetNode';
-import { getNode, parse, validate } from './util';
+import { getNode, parseDocument, validate } from './util';
 
 export function mergeLines() {
 	let editor = vscode.window.activeTextEditor;
 	if (!validate(false)) {
 		return;
 	}
 
-	let rootNode = parse(editor.document);
+	let rootNode = parseDocument(editor.document);
 	if (!rootNode) {
 		return;
 	}
diff --git a/extensions/emmet/src/reflectCssValue.ts b/extensions/emmet/src/reflectCssValue.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { Range, window, TextEditor } from 'vscode';
-import { getCssProperty, getCssPropertyNode } from './util';
+import { getCssPropertyFromRule, getCssPropertyFromDocument } from './util';
 import { Property, Rule } from 'EmmetNode';
 
 const vendorPrefixes = ['-webkit-', '-moz-', '-ms-', '-o-', ''];
@@ -16,7 +16,7 @@ export function reflectCssValue() {
 		return;
 	}
 
-	let node = getCssPropertyNode(editor, editor.selection.active);
+	let node = getCssPropertyFromDocument(editor, editor.selection.active);
 	if (!node) {
 		return;
 	}
@@ -45,7 +45,7 @@ function updateCSSNode(editor: TextEditor, property: Property) {
 			if (prefix === currentPrefix) {
 				return;
 			}
-			let vendorProperty = getCssProperty(rule, prefix + propertyName);
+			let vendorProperty = getCssPropertyFromRule(rule, prefix + propertyName);
 			if (vendorProperty) {
 				builder.replace(new Range(vendorProperty.valueToken.start, vendorProperty.valueToken.end), propertyValue);
 			}
diff --git a/extensions/emmet/src/removeTag.ts b/extensions/emmet/src/removeTag.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { parse, validate, getNode } from './util';
+import { parseDocument, validate, getNode } from './util';
 import { HtmlNode } from 'EmmetNode';
 
 export function removeTag() {
@@ -13,7 +13,7 @@ export function removeTag() {
 		return;
 	}
 
-	let rootNode = <HtmlNode>parse(editor.document);
+	let rootNode = <HtmlNode>parseDocument(editor.document);
 	if (!rootNode) {
 		return;
 	}
diff --git a/extensions/emmet/src/selectItem.ts b/extensions/emmet/src/selectItem.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { validate, parse } from './util';
+import { validate, parseDocument } from './util';
 import { nextItemHTML, prevItemHTML } from './selectItemHTML';
 import { nextItemStylesheet, prevItemStylesheet } from './selectItemStylesheet';
 import { isStyleSheet } from 'vscode-emmet-helper';
@@ -27,7 +27,7 @@ export function fetchSelectItem(direction: string): void {
 		prevItem = prevItemHTML;
 	}
 
-	let rootNode = parse(editor.document);
+	let rootNode = parseDocument(editor.document);
 	if (!rootNode) {
 		return;
 	}
diff --git a/extensions/emmet/src/splitJoinTag.ts b/extensions/emmet/src/splitJoinTag.ts
@@ -5,15 +5,15 @@
 
 import * as vscode from 'vscode';
 import Node from '@emmetio/node';
-import { getNode, parse, validate } from './util';
+import { getNode, parseDocument, validate } from './util';
 
 export function splitJoinTag() {
 	let editor = vscode.window.activeTextEditor;
 	if (!validate(false)) {
 		return;
 	}
 
-	let rootNode = parse(editor.document);
+	let rootNode = parseDocument(editor.document);
 	if (!rootNode) {
 		return;
 	}
diff --git a/extensions/emmet/src/toggleComment.ts b/extensions/emmet/src/toggleComment.ts
@@ -4,7 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as vscode from 'vscode';
-import { getNodesInBetween, getNode, parse } from './util';
+import { getNodesInBetween, getNode, parseDocument } from './util';
 import { Node, Stylesheet } from 'EmmetNode';
 import { isStyleSheet } from 'vscode-emmet-helper';
 
@@ -34,7 +34,7 @@ export function toggleComment() {
 		endComment = endCommentHTML;
 	}
 
-	let rootNode = parse(editor.document);
+	let rootNode = parseDocument(editor.document);
 	if (!rootNode) {
 		return;
 	}
diff --git a/extensions/emmet/src/updateImageSize.ts b/extensions/emmet/src/updateImageSize.ts
@@ -11,7 +11,7 @@ import { TextEditor, Range, Position, window } from 'vscode';
 import * as path from 'path';
 import { getImageSize } from './imageSizeHelper';
 import { isStyleSheet } from 'vscode-emmet-helper';
-import { parse, getNode, iterateCSSToken, getCssProperty } from './util';
+import { parseDocument, getNode, iterateCSSToken, getCssPropertyFromRule } from './util';
 import { HtmlNode, CssToken, HtmlToken, Attribute, Property } from 'EmmetNode';
 import { locateFile } from './locateFile';
 import parseStylesheet from '@emmetio/css-parser';
@@ -59,7 +59,7 @@ function updateImageSizeHTML(editor: TextEditor) {
 
 function updateImageSizeStyleTag(editor: TextEditor) {
 	let getPropertyInsiderStyleTag = (editor) => {
-		const rootNode = parse(editor.document);
+		const rootNode = parseDocument(editor.document);
 		const currentNode = <HtmlNode>getNode(rootNode, editor.selection.active);
 		if (currentNode && currentNode.name === 'style'
 			&& currentNode.open.end.isBefore(editor.selection.active)
@@ -109,7 +109,7 @@ function updateImageSizeCSS(editor: TextEditor, fetchNode: (editor) => Property)
  * @return {HtmlNode}
  */
 function getImageHTMLNode(editor: TextEditor): HtmlNode {
-	const rootNode = parse(editor.document);
+	const rootNode = parseDocument(editor.document);
 	const node = <HtmlNode>getNode(rootNode, editor.selection.active, true);
 
 	return node && node.name.toLowerCase() === 'img' ? node : null;
@@ -122,7 +122,7 @@ function getImageHTMLNode(editor: TextEditor): HtmlNode {
  * @return {Property}
  */
 function getImageCSSNode(editor: TextEditor): Property {
-	const rootNode = parse(editor.document);
+	const rootNode = parseDocument(editor.document);
 	const node = getNode(rootNode, editor.selection.active, true);
 	return node && node.type === 'property' ? <Property>node : null;
 }
@@ -213,8 +213,8 @@ function updateHTMLTag(editor: TextEditor, node: HtmlNode, width: number, height
  */
 function updateCSSNode(editor: TextEditor, srcProp: Property, width: number, height: number) {
 	const rule = srcProp.parent;
-	const widthProp = getCssProperty(rule, 'width');
-	const heightProp = getCssProperty(rule, 'height');
+	const widthProp = getCssPropertyFromRule(rule, 'width');
+	const heightProp = getCssPropertyFromRule(rule, 'height');
 
 	// Detect formatting
 	const separator = srcProp.separator || ': ';
diff --git a/extensions/emmet/src/updateTag.ts b/extensions/emmet/src/updateTag.ts
@@ -5,14 +5,14 @@
 
 import * as vscode from 'vscode';
 import { HtmlNode } from 'EmmetNode';
-import { getNode, parse, validate } from './util';
+import { getNode, parseDocument, validate } from './util';
 
 export function updateTag(tagName: string): Thenable<boolean> {
 	let editor = vscode.window.activeTextEditor;
 	if (!validate(false)) {
 		return;
 	}
-	let rootNode = <HtmlNode>parse(editor.document);
+	let rootNode = <HtmlNode>parseDocument(editor.document);
 	if (!rootNode) {
 		return;
 	}
diff --git a/extensions/emmet/src/util.ts b/extensions/emmet/src/util.ts
@@ -63,7 +63,7 @@ export function getMappingForIncludedLanguages(): any {
  * Parses the given document using emmet parsing modules
  * @param document
  */
-export function parse(document: vscode.TextDocument, showError: boolean = true): Node {
+export function parseDocument(document: vscode.TextDocument, showError: boolean = true): Node {
 	let parseContent = isStyleSheet(document.languageId) ? parseStylesheet : parse;
 	let rootNode: Node;
 	try {
@@ -283,7 +283,7 @@ export function iterateCSSToken(token: CssToken, fn) {
  * @param  {String} name
  * @return {Property}
  */
-export function getCssProperty(rule, name): Property {
+export function getCssPropertyFromRule(rule, name): Property {
 	return rule.children.find(node => node.type === 'property' && node.name === name);
 }
 
@@ -293,8 +293,8 @@ export function getCssProperty(rule, name): Property {
  * @param  {TextEditor}  editor
  * @return {Property}
  */
-export function getCssPropertyNode(editor: vscode.TextEditor, position: vscode.Position): Property {
-	const rootNode = this.parse(editor.document);
+export function getCssPropertyFromDocument(editor: vscode.TextEditor, position: vscode.Position): Property {
+	const rootNode = parseDocument(editor.document);
 	const node = getNode(rootNode, position);
 
 	if (isStyleSheet(editor.document.languageId)) {

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`import * as vscode from 'vscode';`
`7`	`7`	`import { HtmlNode } from 'EmmetNode';`
`8`		`-import { getNode, parse, validate } from './util';`
	`8`	`+import { getNode, parseDocument, validate } from './util';`
`9`	`9`
`10`	`10`	`export function balanceOut() {`
`11`	`11`	`balance(true);`
`@@ -21,7 +21,7 @@ function balance(out: boolean) {`
`21`	`21`	`return;`
`22`	`22`	`}`
`23`	`23`
`24`		`- let rootNode = <HtmlNode>parse(editor.document);`
	`24`	`+ let rootNode = <HtmlNode>parseDocument(editor.document);`
`25`	`25`	`if (!rootNode) {`
`26`	`26`	`return;`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`--------------------------------------------------------------------------------------------/`
`5`	`5`
`6`	`6`	`import { Range, window, TextEditor } from 'vscode';`
`7`		`-import { getCssProperty, getCssPropertyNode } from './util';`
	`7`	`+import { getCssPropertyFromRule, getCssPropertyFromDocument } from './util';`
`8`	`8`	`import { Property, Rule } from 'EmmetNode';`
`9`	`9`
`10`	`10`	`const vendorPrefixes = ['-webkit-', '-moz-', '-ms-', '-o-', ''];`
`@@ -16,7 +16,7 @@ export function reflectCssValue() {`
`16`	`16`	`return;`
`17`	`17`	`}`
`18`	`18`
`19`		`- let node = getCssPropertyNode(editor, editor.selection.active);`
	`19`	`+ let node = getCssPropertyFromDocument(editor, editor.selection.active);`
`20`	`20`	`if (!node) {`
`21`	`21`	`return;`
`22`	`22`	`}`
`@@ -45,7 +45,7 @@ function updateCSSNode(editor: TextEditor, property: Property) {`
`45`	`45`	`if (prefix === currentPrefix) {`
`46`	`46`	`return;`
`47`	`47`	`}`
`48`		`- let vendorProperty = getCssProperty(rule, prefix + propertyName);`
	`48`	`+ let vendorProperty = getCssPropertyFromRule(rule, prefix + propertyName);`
`49`	`49`	`if (vendorProperty) {`
`50`	`50`	`builder.replace(new Range(vendorProperty.valueToken.start, vendorProperty.valueToken.end), propertyValue);`
`51`	`51`	`}`