fix: the selection of the opening file in url may be cleared (#406)

Author: conwnet

extensions/github1s/src/extension.ts

@@ -61,13 +61,10 @@ const initialVSCodeState = async () => {
 		let documentShowOptions: vscode.TextDocumentShowOptions = {};
 		if (startLine || endLine) {
 			const startPosition = new vscode.Position((startLine || endLine)! - 1, 0);
-			const endPosition = new vscode.Position((endLine || startLine)! - 1, 999999);
+			const endPosition = new vscode.Position((endLine || startLine)! - 1, 1 << 20);
 			documentShowOptions = { selection: new vscode.Range(startPosition, endPosition) };
 		}
-		// TODO: the selection of the opening file may be cleared
-		// when editor try to restore previous state in the same file
-		vscode.commands.executeCommand(
-			'vscode.open',
+		vscode.window.showTextDocument(
 			vscode.Uri.parse('').with({ scheme, path: `/${routerState.filePath}` }),
 			documentShowOptions
 		);

extensions/github1s/src/listeners/vscode.ts

@@ -54,7 +54,7 @@ const handleRouterOnTextEditorSelectionChange = async (editor: vscode.TextEditor
 	const routerParser = await router.resolveParser();
 
 	// only add the line number anchor when pageType is PageType.Blob
-	if (pageType !== PageType.Blob || !editor.selection) {
+	if (pageType !== PageType.Blob || !editor?.selection) {
 		return;
 	}
 
@@ -63,11 +63,11 @@ const handleRouterOnTextEditorSelectionChange = async (editor: vscode.TextEditor
 		repo,
 		ref,
 		activeFileUri.path.slice(1),
-		editor.selection.start.line + 1,
+		!editor.selection.isEmpty ? editor.selection.start.line + 1 : undefined,
 		editor.selection.end.line !== editor.selection.start.line ? editor.selection.end.line + 1 : undefined
 	);
 
-	router.replace(browserPath);
+	browserPath !== (await router.getPath()) && router.replace(browserPath);
 };
 
 // refresh file history view if active editor changed

extensions/github1s/src/router/index.ts

@@ -70,6 +70,12 @@ export class Router extends EventEmitter<RouterState> {
 		return this._history!;
 	}
 
+	public async getPath() {
+		await this._barrier.wait();
+		const { pathname, search, hash } = this._history!.location;
+		return `${pathname}${search}${hash}`;
+	}
+
 	// push the url with current history
 	public async push(path: string) {
 		await this._barrier.wait();