refactor file opening code

Author: WebFreak001

src/dpldocs.ts

@@ -1,7 +1,7 @@
 import * as vscode from "vscode";
 import * as path from "path";
 import { JSDOM } from "jsdom";
-import { reqText } from "./util";
+import { openTextDocumentAtRange, reqText } from "./util";
 import { served } from "./extension";
 import { DubDependencyInfo } from "./dub-view";
 import { DOMParser } from "@xmldom/xmldom";
@@ -637,17 +637,8 @@ function focusModule(module_: string, line: number) {
 	served.findFilesByModule(module_).then(files => {
 		if (!files.length) {
 			vscode.window.showErrorMessage("Could not find module " + module_);
-		}
-		else {
-			vscode.workspace.openTextDocument(files[0]).then(doc => {
-				vscode.window.showTextDocument(doc).then(editor => {
-					if (line > 0) {
-						var pos = new vscode.Position(line - 1, 0);
-						editor.revealRange(new vscode.Range(pos, pos), vscode.TextEditorRevealType.InCenter);
-						editor.selection.active = pos;
-					}
-				});
-			});
+		} else {
+			openTextDocumentAtRange(vscode.Uri.parse(files[0]), line > 0 ? line - 1 : null);
 		}
 	});
 }

src/gcprofiler.ts

@@ -1,5 +1,6 @@
 import * as vscode from "vscode";
 import { served } from "./extension";
+import { openTextDocumentAtRange } from "./util";
 
 interface ProfileQuickPick extends vscode.QuickPickItem {
 	uri: string;
@@ -21,13 +22,7 @@ export class GCProfiler {
 
 		vscode.window.showQuickPick(items).then(item => {
 			if (item)
-				vscode.workspace.openTextDocument(vscode.Uri.parse(item.uri)).then(doc => {
-					vscode.window.showTextDocument(doc).then(editor => {
-						let line = doc.lineAt(item.line - 1);
-						editor.revealRange(line.range, vscode.TextEditorRevealType.InCenterIfOutsideViewport);
-						editor.selection = new vscode.Selection(line.range.start, line.range.start);
-					});
-				});
+				openTextDocumentAtRange(vscode.Uri.parse(item.uri), item.line - 1);
 		});
 	}
 

src/util.ts

@@ -148,3 +148,27 @@ export function showQuickPickWithInput<T>(items: T[] | Thenable<T[]>, options?:
 		quickPick.show();
 	});
 }
+
+/**
+ * @param uri The text document to open and show to the user.
+ * @param lineOrRange
+ *     If null, only open the text document, don't scroll or select anything (default vscode behavior)
+ *     If a number, this is the 0-based line number to focus and put the cursor on.
+ *     If a range, this is a range to focus in the center of the editor and put the cursor at the start of.
+ */
+export function openTextDocumentAtRange(uri: vscode.Uri, lineOrRange: null | number | vscode.Position | vscode.Range): Thenable<vscode.TextEditor> {
+	return vscode.workspace.openTextDocument(uri).then(doc =>
+		vscode.window.showTextDocument(doc).then(editor => {
+			if (lineOrRange !== null) {
+				if (typeof lineOrRange == "number")
+					lineOrRange = doc.lineAt(lineOrRange).range;
+				if (lineOrRange instanceof vscode.Position)
+					lineOrRange = new vscode.Range(lineOrRange, lineOrRange);
+
+				editor.revealRange(lineOrRange, vscode.TextEditorRevealType.InCenterIfOutsideViewport);
+				editor.selection = new vscode.Selection(lineOrRange.start, lineOrRange.start);
+			}
+			return editor;
+		})
+	);
+}