diff --git a/extensions/git-extended/media/index.css b/extensions/git-extended/media/index.css
index 4b4a3d7b050..874bf667248 100644
--- a/extensions/git-extended/media/index.css
+++ b/extensions/git-extended/media/index.css
@@ -135,6 +135,8 @@ body .comment-form {
body .comment-form textarea {
display: block;
+ box-sizing: border-box;
+ padding: 10px;
width: 100%;
min-height: 100px;
max-height: 500px;
diff --git a/extensions/git-extended/media/index.js b/extensions/git-extended/media/index.js
index 73ca9a06839..5af8b7bc99b 100644
--- a/extensions/git-extended/media/index.js
+++ b/extensions/git-extended/media/index.js
@@ -17293,7 +17293,7 @@ function setTitleHTML(pr) {
-
${pullRequestOverviewRenderer_1.getStatus(pr)}
+
${pullRequestOverviewRenderer_1.getStatus(pr.state)}
${pr.author.login}
@@ -17369,6 +17369,12 @@ var EventType;
EventType[EventType["Reviewed"] = 4] = "Reviewed";
EventType[EventType["Other"] = 5] = "Other";
})(EventType = exports.EventType || (exports.EventType = {}));
+var PullRequestStateEnum;
+(function (PullRequestStateEnum) {
+ PullRequestStateEnum[PullRequestStateEnum["Open"] = 0] = "Open";
+ PullRequestStateEnum[PullRequestStateEnum["Merged"] = 1] = "Merged";
+ PullRequestStateEnum[PullRequestStateEnum["Closed"] = 2] = "Closed";
+})(PullRequestStateEnum = exports.PullRequestStateEnum || (exports.PullRequestStateEnum = {}));
function renderComment(comment) {
return `
diff --git a/extensions/git-extended/preview-src/pullRequestOverviewRenderer.ts b/extensions/git-extended/preview-src/pullRequestOverviewRenderer.ts
index 90e5f9dc6c6..2a1b7aad06c 100644
--- a/extensions/git-extended/preview-src/pullRequestOverviewRenderer.ts
+++ b/extensions/git-extended/preview-src/pullRequestOverviewRenderer.ts
@@ -138,6 +138,12 @@ export interface CommitEvent {
event: EventType;
}
+export enum PullRequestStateEnum {
+ Open,
+ Merged,
+ Closed,
+}
+
export type TimelineEvent = CommitEvent | ReviewEvent | SubscribeEvent | CommentEvent | MentionEvent;
export function renderComment(comment: CommentEvent): string {
@@ -199,20 +205,20 @@ export function renderTimelineEvent(timelineEvent: TimelineEvent): string {
return '';
}
-// export function getStatusBGCoor(pr: any) {
-// if (pr.isMerged) {
-// return '#6f42c1';
-// } else if (pr.isOpen) {
-// return '#2cbe4e';
-// } else {
-// return '#cb2431';
-// }
-// }
+export function getStatusBGCoor(state: PullRequestStateEnum) {
+ if (state === PullRequestStateEnum.Merged) {
+ return '#6f42c1';
+ } else if (state === PullRequestStateEnum.Open) {
+ return '#2cbe4e';
+ } else {
+ return '#cb2431';
+ }
+}
-export function getStatus(pr: any) {
- if (pr.isMerged) {
+export function getStatus(state: PullRequestStateEnum) {
+ if (state === PullRequestStateEnum.Merged) {
return 'Merged';
- } else if (pr.isOpen) {
+ } else if (state === PullRequestStateEnum.Open) {
return 'Open';
} else {
return 'Closed';
diff --git a/extensions/git-extended/resources/icons/dark/book.svg b/extensions/git-extended/resources/icons/dark/book.svg
index 6bf1ece25d5..c0acf6cdd36 100644
--- a/extensions/git-extended/resources/icons/dark/book.svg
+++ b/extensions/git-extended/resources/icons/dark/book.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/extensions/git-extended/src/common/pullRequestOverview.ts b/extensions/git-extended/src/common/pullRequestOverview.ts
index 6591e1d3628..059e8260fc6 100644
--- a/extensions/git-extended/src/common/pullRequestOverview.ts
+++ b/extensions/git-extended/src/common/pullRequestOverview.ts
@@ -24,13 +24,15 @@ export class PullRequestOverviewPanel {
public static createOrShow(extensionPath: string, pullRequestModel: PullRequestModel) {
const column = vscode.window.activeTextEditor ? vscode.window.activeTextEditor.viewColumn : undefined;
+ const title = `Pull Request #${pullRequestModel.prNumber.toString()}`;
// If we already have a panel, show it.
// Otherwise, create a new panel.
if (PullRequestOverviewPanel.currentPanel) {
PullRequestOverviewPanel.currentPanel._panel.reveal(column);
+ PullRequestOverviewPanel.currentPanel._panel.title = title;
} else {
- PullRequestOverviewPanel.currentPanel = new PullRequestOverviewPanel(extensionPath, column || vscode.ViewColumn.One);
+ PullRequestOverviewPanel.currentPanel = new PullRequestOverviewPanel(extensionPath, column || vscode.ViewColumn.One, title);
}
PullRequestOverviewPanel.currentPanel.update(pullRequestModel);
@@ -39,11 +41,11 @@ export class PullRequestOverviewPanel {
});
}
- private constructor(extensionPath: string, column: vscode.ViewColumn) {
+ private constructor(extensionPath: string, column: vscode.ViewColumn, title: string) {
this._extensionPath = extensionPath;
// Create and show a new webview panel
- this._panel = vscode.window.createWebviewPanel(PullRequestOverviewPanel.viewType, 'Pull Request', column, {
+ this._panel = vscode.window.createWebviewPanel(PullRequestOverviewPanel.viewType, title, column, {
// Enable javascript in the webview
enableScripts: true,
diff --git a/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts b/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
index 60765a5c9fb..5dac9dd6236 100644
--- a/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
+++ b/src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
@@ -277,7 +277,7 @@ export class ReviewController implements IEditorContribution {
this.addComment(lineNumber);
})
: this._newCommentGlyph = new CommentGlyphWidget('comment-hint', this.editor, lineNumber, true, () => {
- this.notificationService.warn('Commenting is not supported outside of diff chunk areas.');
+ this.notificationService.warn('Commenting is not supported outside of diff hunk areas.');
});
this.editor.layoutContentWidget(this._newCommentGlyph);
diff --git a/src/vs/workbench/parts/comments/electron-browser/media/review.css b/src/vs/workbench/parts/comments/electron-browser/media/review.css
index 13131533a9e..9854ade1898 100644
--- a/src/vs/workbench/parts/comments/electron-browser/media/review.css
+++ b/src/vs/workbench/parts/comments/electron-browser/media/review.css
@@ -34,8 +34,7 @@
}
.monaco-editor .review-widget .body .review-comment {
- margin-left: 20px;
- padding: 8px 16px 8px 0px;
+ padding: 8px 16px 8px 20px;
display: flex;
}
${pr.title} (#${pr.number})