styles: invert isVueFile condition and add Region type

mrmlnc · Jan 5, 2020 · ad2297c · ad2297c
1 parent 28dd9ce
commit ad2297c
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/src/utils/vue.ts b/src/utils/vue.ts
@@ -1,11 +1,13 @@
 import { TextDocument, Position } from 'vscode-languageserver';
 
+type Region = [number, number];
+
 export function isVueFile(path: string) {
 	return path.endsWith('.vue');
 }
 
 export function getVueSCSSRegions(content: string) {
-	const regions: Array<[number, number]> = [];
+	const regions: Region[] = [];
 	const startRe = /<style[\w=\"\' \n\t]{1,}lang=[\"\']scss[\"\'][\w=\"\' \n\t]{0,}>/g;
 	const endRe = /<\/style>/g;
 	/* tslint:disable:no-conditional-assignment */
@@ -32,19 +34,17 @@ export function getVueSCSSContent(content: string, regions = getVueSCSSRegions(c
 	return newContent;
 }
 
-function convertVueTextDocument(document: TextDocument, regions: Array<[number, number]>) {
+function convertVueTextDocument(document: TextDocument, regions: Region[]) {
 	return TextDocument.create(document.uri, 'scss', document.version, getVueSCSSContent(document.getText(), regions));
 }
 
 export function getSCSSRegionsDocument(document: TextDocument, position: Position) {
 	const offset = document.offsetAt(position);
-	if (isVueFile(document.uri)) {
-		const vueSCSSRegions = getVueSCSSRegions(document.getText());
-		if (vueSCSSRegions.some(region => region[0] <= offset && region[1] >= offset)) {
-			return { document: convertVueTextDocument(document, vueSCSSRegions), offset };
-		}
-		return { document: null, offset };
-	}
+	if (!isVueFile(document.uri)) { return { document, offset }; }
 
-	return { document, offset };
+	const vueSCSSRegions = getVueSCSSRegions(document.getText());
+	if (vueSCSSRegions.some(region => region[0] <= offset && region[1] >= offset)) {
+		return { document: convertVueTextDocument(document, vueSCSSRegions), offset };
+	}
+	return { document: null, offset };
 }