Merge remote-tracking branch 'origin/master' into misolori/ux-polish

Author: rebornix

.gitignore

@@ -221,7 +221,7 @@ ClientBin/
 *.publishsettings
 orleans.codegen.cs
 
-# Including strong name files can present a security risk 
+# Including strong name files can present a security risk
 # (https://github.com/github/gitignore/pull/2483#issue-259490424)
 #*.snk
 
@@ -317,7 +317,7 @@ __pycache__/
 # OpenCover UI analysis results
 OpenCover/
 
-# Azure Stream Analytics local run output 
+# Azure Stream Analytics local run output
 ASALocalRun/
 
 # MSBuild Binary and Structured Log
@@ -326,11 +326,12 @@ ASALocalRun/
 # NVidia Nsight GPU debugger configuration file
 *.nvuser
 
-# MFractors (Xamarin productivity tool) working folder 
+# MFractors (Xamarin productivity tool) working folder
 .mfractor/
 
 
 out
 node_modules
 media
-.DS_Store
+.DS_Store
+*.vsix

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+	"recommendations": [
+		"eamodio.tsl-problem-matcher"
+	]
+}

.vscode/launch.json

@@ -9,9 +9,14 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}"
 			],
+			"smartStep": true,
+			"sourceMaps": true,
 			"outFiles": [
-				"${workspaceFolder}/out/**/*.js"
-			]
+				"${workspaceFolder}/media/*.js"
+			],
+			"sourceMapPathOverrides": {
+				"webpack:///./*": "${workspaceRoot}/*"
+			}
 		},
 		{
 			"name": "Extension Tests",

.vscode/tasks.json

@@ -4,31 +4,15 @@
 	"version": "2.0.0",
 	"tasks": [
 		{
-			"label": "watch all",
-			"dependsOn": [
-				"webpack:preview",
-				"npm:src"
-			],
-			"group": {
+			"identifier": "npm",
+			"label": "npm",
+			"type": "npm",
+			"script": "watch",
+			"problemMatcher": ["$ts-webpack-watch"],
+			"group":{
 				"kind": "build",
 				"isDefault": true
-			},
-			"problemMatcher": []
-		},
-		{
-			"identifier": "npm:src",
-			"label": "npm src",
-			"type": "npm",
-			"script": "compile",
-			"problemMatcher": [],
-			"group": "build"
-		},
-		{
-			"identifier": "webpack:preview",
-			"label": "npm build-preview",
-			"type": "npm",
-			"script": "build-preview",
-			"group": "build"
+			}
 		}
 	]
 }

.vscodeignore

@@ -1,6 +1,8 @@
 .vscode/**
-out/test/**
-out/**/*.map
+out/**
 src/**
+preview-src/**
+node_modules/**
 .gitignore
-tsconfig.json
+tsconfig.json
+*.vsix

package-lock.json

@@ -8,7 +8,7 @@
     "url": "https://github.com/Microsoft/vscode-pull-request-github"
   },
   "enableProposedApi": true,
-  "version": "0.0.10",
+  "version": "0.0.12",
   "publisher": "Microsoft",
   "engines": {
     "vscode": "^1.25.0"
@@ -22,7 +22,7 @@
   "extensionDependencies": [
     "vscode.git"
   ],
-  "main": "./out/extension",
+  "main": "./media/extension",
   "contributes": {
     "configuration": {
       "type": "object",
@@ -69,7 +69,7 @@
     "commands": [
       {
         "command": "pr.pick",
-        "title": "Checkout Pull Request",
+        "title": "Check Out Pull Request",
         "category": "GitHub Pull Requests"
       },
       {
@@ -214,8 +214,8 @@
   "scripts": {
     "vscode:prepublish": "tsc -p ./ && webpack --mode production",
     "postinstall": "node ./node_modules/vscode/bin/install",
-    "compile": "tsc -watch -p ./",
-    "build-preview": "webpack --watch --mode development",
+    "compile": "tsc -p ./",
+    "watch": "webpack --watch --mode development",
     "test": "node ./node_modules/mocha/bin/_mocha --timeout 1000 --colors ./out/test/**/*.js"
   },
   "devDependencies": {

package.json

@@ -305,6 +305,11 @@ body .comment-form textarea {
 	background-color: var(--vscode-input-background);
 	color: var(--vscode-input-foreground);
 	font-family: var(--vscode-editor-font-family);
+	resize: none;
+}
+
+.reply-button {
+	margin-left: auto;
 }
 
 body .comment-form textarea:focus {
@@ -315,6 +320,7 @@ body .comment-form .form-actions {
 	overflow: auto;
 	padding-top: 20px;
 	margin-bottom: 10px;
+	display: flex;
 }
 
 body button:disabled {

preview-src/index.css

@@ -3,7 +3,7 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 import './index.css';
-import { renderTimelineEvent, getStatus, renderComment, PullRequestStateEnum } from './pullRequestOverviewRenderer';
+import { renderTimelineEvent, getStatus, renderComment, PullRequestStateEnum, renderReview } from './pullRequestOverviewRenderer';
 import md from './mdRenderer';
 
 declare var acquireVsCodeApi: any;
@@ -14,6 +14,8 @@ const ElementIds = {
 	CheckoutDefaultBranch: 'checkout-default-branch',
 	Close: 'close',
 	Reply: 'reply',
+	Approve: 'approve',
+	RequestChanges: 'request-changes',
 	Status: 'status',
 	CommentTextArea: 'comment-textarea',
 	TimelineEvents:'timeline-events' // If updating this value, change id in pullRequestOverview.ts as well.
@@ -33,6 +35,16 @@ function handleMessage(event: any) {
 			break;
 		case 'pr.append-comment':
 			appendComment(message.value);
+			break;
+		case 'pr.append-review':
+			appendReview(message.value);
+			break;
+		case 'pr.enable-approve':
+			(<HTMLButtonElement>document.getElementById(ElementIds.Approve)).disabled = false;
+			break;
+		case 'pr.enable-request-changes':
+			(<HTMLButtonElement>document.getElementById(ElementIds.RequestChanges)).disabled = false;
+			break;
 		default:
 			break;
 	}
@@ -93,19 +105,42 @@ function addEventListeners(pr: any) {
 		});
 	});
 
-	// Enable 'Comment' button only when the user has entered text
+	// Enable 'Comment' and 'RequestChanges' button only when the user has entered text
 	document.getElementById(ElementIds.CommentTextArea)!.addEventListener('input', (e) => {
-		(<HTMLButtonElement>document.getElementById(ElementIds.Reply)).disabled = !(<any>e.target).value;
-	})
+		const hasNoText = !(<any>e.target).value;
+		(<HTMLButtonElement>document.getElementById(ElementIds.Reply)).disabled = hasNoText;
+		(<HTMLButtonElement>document.getElementById(ElementIds.RequestChanges)).disabled = hasNoText;
+
+	});
 
 	document.getElementById(ElementIds.Reply)!.addEventListener('click', () => {
 		submitComment();
 	});
 
 	document.getElementById(ElementIds.Close)!.addEventListener('click', () => {
 		(<HTMLButtonElement>document.getElementById(ElementIds.Close)).disabled = true;
+		const inputBox = (<HTMLTextAreaElement>document.getElementById(ElementIds.CommentTextArea));
+		vscode.postMessage({
+			command: 'pr.close',
+			text: inputBox.value
+		});
+	});
+
+	document.getElementById(ElementIds.Approve)!.addEventListener('click', () => {
+		(<HTMLButtonElement>document.getElementById(ElementIds.Approve)).disabled = true;
+		const inputBox = (<HTMLTextAreaElement>document.getElementById(ElementIds.CommentTextArea));
+		vscode.postMessage({
+			command: 'pr.approve',
+			text: inputBox.value
+		});
+	});
+
+	document.getElementById(ElementIds.RequestChanges)!.addEventListener('click', () => {
+		(<HTMLButtonElement>document.getElementById(ElementIds.RequestChanges)).disabled = true;
+		const inputBox = (<HTMLTextAreaElement>document.getElementById(ElementIds.CommentTextArea));
 		vscode.postMessage({
-			command: 'pr.close'
+			command: 'pr.request-changes',
+			text: inputBox.value
 		});
 	});
 
@@ -118,18 +153,31 @@ function addEventListeners(pr: any) {
 	});
 }
 
+function clearTextArea() {
+	(<HTMLTextAreaElement>document.getElementById(ElementIds.CommentTextArea)!).value = '';
+	(<HTMLButtonElement>document.getElementById(ElementIds.Reply)).disabled = true;
+	(<HTMLButtonElement>document.getElementById(ElementIds.RequestChanges)).disabled = true;
+}
+
 function submitComment() {
 	(<HTMLButtonElement>document.getElementById(ElementIds.Reply)).disabled = true;
 	vscode.postMessage({
 		command: 'pr.comment',
 		text: (<HTMLTextAreaElement>document.getElementById(ElementIds.CommentTextArea)!).value
 	});
-	(<HTMLTextAreaElement>document.getElementById(ElementIds.CommentTextArea)!).value = '';
+
+}
+
+function appendReview(review: any): void {
+	const newReview = renderReview(review);
+	document.getElementById(ElementIds.TimelineEvents)!.insertAdjacentHTML('beforeend', newReview);
+	clearTextArea();
 }
 
 function appendComment(comment: any) {
 	let newComment = renderComment(comment);
 	document.getElementById(ElementIds.TimelineEvents)!.insertAdjacentHTML('beforeend', newComment);
+	clearTextArea();
 }
 
 function updateCheckoutButton(isCheckedOut: boolean) {
@@ -138,7 +186,7 @@ function updateCheckoutButton(isCheckedOut: boolean) {
 	checkoutButton.disabled = isCheckedOut;
 	checkoutMasterButton.disabled = false;
 	const activeIcon = '<svg class="octicon octicon-check" viewBox="0 0 12 16" version="1.1" width="12" height="16" aria-hidden="true"><path fill-rule="evenodd" d="M12 5l-8 8-4-4 1.5-1.5L4 10l6.5-6.5L12 5z"></path></svg>';
-	checkoutButton.innerHTML = isCheckedOut ? `${activeIcon} Checked Out` : `Checkout`;
+	checkoutButton.innerHTML = isCheckedOut ? `${activeIcon} Checked Out` : `Check out`;
 
 	const backButton = (<HTMLButtonElement>document.getElementById(ElementIds.CheckoutDefaultBranch));
 	if (isCheckedOut) {
@@ -153,8 +201,10 @@ function updateCheckoutButton(isCheckedOut: boolean) {
 function setTextArea() {
 	document.getElementById('comment-form')!.innerHTML = `<textarea id="${ElementIds.CommentTextArea}"></textarea>
 		<div class="form-actions">
-			<button class="reply-button" id="${ElementIds.Reply}" disabled="true"></button>
-			<button class="close-button" id="${ElementIds.Close}"></button>
+			<button id="${ElementIds.Close}">Close Pull Request</button>
+			<button id="${ElementIds.RequestChanges}" disabled="true">Request Changes</button>
+			<button id="${ElementIds.Approve}">Approve</button>
+			<button class="reply-button" id="${ElementIds.Reply}" disabled="true">Comment</button>
 		</div>`;
 
 	(<HTMLTextAreaElement>document.getElementById(ElementIds.CommentTextArea)!).placeholder = 'Leave a comment';
@@ -164,11 +214,9 @@ function setTextArea() {
 			return;
 		}
 
-		if (e.keyCode === 13 && e.ctrlKey) {
+		if (e.keyCode === 13 && (e.metaKey || e.ctrlKey)) {
 			submitComment();
 			return;
 		}
 	});
-	(<HTMLButtonElement>document.getElementById(ElementIds.Reply)!).textContent = 'Comment';
-	(<HTMLButtonElement>document.getElementById(ElementIds.Close)!).textContent = 'Close Pull Request';
 }