more submodule support, diff colorization

extensions/git/src/uri.ts

@@ -7,20 +7,45 @@
 
 import { Uri } from 'vscode';
 
-export function fromGitUri(uri: Uri): { path: string; ref: string; } {
+export interface GitUriParams {
+	path: string;
+	ref: string;
+	submoduleOf?: string;
+}
+
+export function fromGitUri(uri: Uri): GitUriParams {
 	return JSON.parse(uri.query);
 }
 
+export interface GitUriOptions {
+	replaceFileExtension?: boolean;
+	submoduleOf?: string;
+}
+
 // As a mitigation for extensions like ESLint showing warnings and errors
 // for git URIs, let's change the file extension of these uris to .git,
 // when `replaceFileExtension` is true.
-export function toGitUri(uri: Uri, ref: string, replaceFileExtension = false): Uri {
+export function toGitUri(uri: Uri, ref: string, options: GitUriOptions = {}): Uri {
+	const params: GitUriParams = {
+		path: uri.fsPath,
+		ref
+	};
+
+	if (options.submoduleOf) {
+		params.submoduleOf = options.submoduleOf;
+	}
+
+	let path = uri.path;
+
+	if (options.replaceFileExtension) {
+		path = path + `${path}.git`;
+	} else if (options.submoduleOf) {
+		path = path + `${path}.diff`;
+	}
+
 	return uri.with({
 		scheme: 'git',
-		path: replaceFileExtension ? `${uri.path}.git` : uri.path,
-		query: JSON.stringify({
-			path: uri.fsPath,
-			ref
-		})
+		path,
+		query: JSON.stringify(params)
 	});
 }