Merge remote-tracking branch 'origin/dev'

package.json

@@ -2,7 +2,7 @@
 	"name": "google-translate-ext",
 	"displayName": "Google Translate",
 	"description": "Translate your code using Google Translate API.",
-	"version": "2.1.0",
+	"version": "2.2.0",
 	"publisher": "benshabatnoam",
 	"repository": {
 		"type": "git",
@@ -72,7 +72,7 @@
 		"@types/node": "^7.10.9",
 		"@types/vscode": "^1.42.0",
 		"glob": "^7.1.6",
-		"mocha": "^7.0.1",
+		"mocha": "^7.1.2",
 		"tslint": "^5.8.0",
 		"typescript": "^3.7.5",
 		"vscode-test": "^1.3.0"

src/extension.ts

@@ -127,14 +127,24 @@ function translateSelection(selection: vscode.Selection | vscode.Range): void {
 	}
 	if (typeof languages === "string") {
 		translate(selectedText, <vscode.Selection>selection, languages);
-	} else {
-		if (replaceText) {
-			translate(selectedText, <vscode.Selection>selection, languages[0]);
-		} else {
-			languages.forEach((language: string) => {
-				translate(selectedText, <vscode.Selection>selection, language);
+	} else if (replaceText) {
+		if (languages.length > 1) {
+			const quickPick = vscode.window.createQuickPick();
+			quickPick.items = languages.sort().map((label: string) => ({ label }));
+			quickPick.placeholder = "Select a language...";
+			quickPick.onDidAccept(() => {
+				translate(selectedText, <vscode.Selection>selection, quickPick.selectedItems [0].label);
+				quickPick.dispose();
 			});
+			quickPick.onDidHide(() => quickPick.dispose());
+			quickPick.show();
+		} else {
+			translate(selectedText, <vscode.Selection>selection, languages[0]);
 		}
+	} else {
+		languages.forEach((language: string) => {
+			translate(selectedText, <vscode.Selection>selection, language);
+		});
 	}
 }