Add CommentProvider, panel, and editor contribution

build/lib/i18n.resources.json

@@ -34,6 +34,10 @@
 			"name": "vs/workbench/parts/codeEditor",
 			"project": "vscode-workbench"
 		},
+		{
+			"name": "vs/workbench/parts/comments",
+			"project": "vscode-workbench"
+		},
 		{
 			"name": "vs/workbench/parts/debug",
 			"project": "vscode-workbench"

src/vs/code/electron-main/window.ts

@@ -141,7 +141,8 @@ export class CodeWindow implements ICodeWindow {
 			title: product.nameLong,
 			webPreferences: {
 				'backgroundThrottling': false, // by default if Code is in the background, intervals and timeouts get throttled,
-				disableBlinkFeatures: 'Auxclick' // disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
+				disableBlinkFeatures: 'Auxclick', // disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
+				experimentalFeatures: true
 			}
 		};
 

src/vs/editor/browser/controller/coreCommands.ts

@@ -1704,7 +1704,7 @@ registerCommand(new EditorOrNativeTextInputCommand({
 	editorHandler: CoreNavigationCommands.SelectAll,
 	inputHandler: 'selectAll',
 	id: 'editor.action.selectAll',
-	precondition: null,
+	precondition: EditorContextKeys.focus,
 	kbOpts: {
 		weight: CORE_WEIGHT,
 		kbExpr: null,

src/vs/editor/common/modes.ts

@@ -956,6 +956,81 @@ export interface Command {
 	tooltip?: string;
 	arguments?: any[];
 }
+
+export interface CommentInfo {
+	owner: number;
+	threads: CommentThread[];
+	commentingRanges?: IRange[];
+	reply?: Command;
+}
+
+export enum CommentThreadCollapsibleState {
+	/**
+	 * Determines an item is collapsed
+	 */
+	Collapsed = 0,
+	/**
+	 * Determines an item is expanded
+	 */
+	Expanded = 1
+}
+
+export interface CommentThread {
+	threadId: string;
+	resource: string;
+	range: IRange;
+	comments: Comment[];
+	collapsibleState?: CommentThreadCollapsibleState;
+	reply?: Command;
+}
+
+export interface NewCommentAction {
+	ranges: IRange[];
+	actions: Command[];
+}
+
+export interface Comment {
+	readonly commentId: string;
+	readonly body: IMarkdownString;
+	readonly userName: string;
+	readonly gravatar: string;
+	readonly command?: Command;
+}
+
+export interface CommentThreadChangedEvent {
+	readonly owner: number;
+	/**
+	 * Added comment threads.
+	 */
+	readonly added: CommentThread[];
+
+	/**
+	 * Removed comment threads.
+	 */
+	readonly removed: CommentThread[];
+
+	/**
+	 * Changed comment threads.
+	 */
+	readonly changed: CommentThread[];
+}
+
+
+export interface DocumentCommentProvider {
+	provideDocumentComments(resource: URI, token: CancellationToken): Promise<CommentInfo>;
+	createNewCommentThread(resource: URI, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
+	replyToCommentThread(resource: URI, range: Range, thread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
+	onDidChangeCommentThreads(): Event<CommentThreadChangedEvent>;
+}
+
+
+export interface WorkspaceCommentProvider {
+	provideWorkspaceComments(token: CancellationToken): Promise<CommentThread[]>;
+	createNewCommentThread(resource: URI, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
+	replyToCommentThread(resource: URI, range: Range, thread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
+	onDidChangeCommentThreads(): Event<CommentThreadChangedEvent>;
+}
+
 export interface ICodeLensSymbol {
 	range: IRange;
 	id?: string;

src/vs/editor/standalone/browser/standaloneLanguages.ts

@@ -794,6 +794,7 @@ export function createMonacoLanguagesAPI(): typeof monaco.languages {
 		SymbolKind: modes.SymbolKind,
 		IndentAction: IndentAction,
 		SuggestTriggerKind: modes.SuggestTriggerKind,
+		CommentThreadCollapsibleState: modes.CommentThreadCollapsibleState,
 		FoldingRangeKind: modes.FoldingRangeKind
 	};
 }

src/vs/monaco.d.ts

@@ -5147,6 +5147,76 @@ declare namespace monaco.languages {
 		arguments?: any[];
 	}
 
+	export interface CommentInfo {
+		owner: number;
+		threads: CommentThread[];
+		commentingRanges?: IRange[];
+		reply?: Command;
+	}
+
+	export enum CommentThreadCollapsibleState {
+		/**
+		 * Determines an item is collapsed
+		 */
+		Collapsed = 0,
+		/**
+		 * Determines an item is expanded
+		 */
+		Expanded = 1,
+	}
+
+	export interface CommentThread {
+		threadId: string;
+		resource: string;
+		range: IRange;
+		comments: Comment[];
+		collapsibleState?: CommentThreadCollapsibleState;
+		reply?: Command;
+	}
+
+	export interface NewCommentAction {
+		ranges: IRange[];
+		actions: Command[];
+	}
+
+	export interface Comment {
+		readonly commentId: string;
+		readonly body: IMarkdownString;
+		readonly userName: string;
+		readonly gravatar: string;
+		readonly command?: Command;
+	}
+
+	export interface CommentThreadChangedEvent {
+		readonly owner: number;
+		/**
+		 * Added comment threads.
+		 */
+		readonly added: CommentThread[];
+		/**
+		 * Removed comment threads.
+		 */
+		readonly removed: CommentThread[];
+		/**
+		 * Changed comment threads.
+		 */
+		readonly changed: CommentThread[];
+	}
+
+	export interface DocumentCommentProvider {
+		provideDocumentComments(resource: Uri, token: CancellationToken): Promise<CommentInfo>;
+		createNewCommentThread(resource: Uri, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
+		replyToCommentThread(resource: Uri, range: Range, thread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
+		onDidChangeCommentThreads(): IEvent<CommentThreadChangedEvent>;
+	}
+
+	export interface WorkspaceCommentProvider {
+		provideWorkspaceComments(token: CancellationToken): Promise<CommentThread[]>;
+		createNewCommentThread(resource: Uri, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
+		replyToCommentThread(resource: Uri, range: Range, thread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
+		onDidChangeCommentThreads(): IEvent<CommentThreadChangedEvent>;
+	}
+
 	export interface ICodeLensSymbol {
 		range: IRange;
 		id?: string;

src/vs/vscode.proposed.d.ts

@@ -297,6 +297,80 @@ declare module 'vscode' {
 
 	//#endregion
 
+	//#region Comments
+	/**
+	 * Comments provider related APIs are still in early stages, they may be changed significantly during our API experiments.
+	 */
+
+	interface CommentInfo {
+		threads: CommentThread[];
+		commentingRanges?: Range[];
+	}
+
+	export enum CommentThreadCollapsibleState {
+		/**
+		 * Determines an item is collapsed
+		 */
+		Collapsed = 0,
+		/**
+		 * Determines an item is expanded
+		 */
+		Expanded = 1
+	}
+
+	interface CommentThread {
+		threadId: string;
+		resource: Uri;
+		range: Range;
+		comments: Comment[];
+		collapsibleState?: CommentThreadCollapsibleState;
+	}
+
+	interface Comment {
+		commentId: string;
+		body: MarkdownString;
+		userName: string;
+		gravatar: string;
+		command?: Command;
+	}
+
+	export interface CommentThreadChangedEvent {
+		/**
+		 * Added comment threads.
+		 */
+		readonly added: CommentThread[];
+
+		/**
+		 * Removed comment threads.
+		 */
+		readonly removed: CommentThread[];
+
+		/**
+		 * Changed comment threads.
+		 */
+		readonly changed: CommentThread[];
+	}
+
+	interface DocumentCommentProvider {
+		provideDocumentComments(document: TextDocument, token: CancellationToken): Promise<CommentInfo>;
+		createNewCommentThread?(document: TextDocument, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
+		replyToCommentThread?(document: TextDocument, range: Range, commentThread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
+		onDidChangeCommentThreads?: Event<CommentThreadChangedEvent>;
+	}
+
+	interface WorkspaceCommentProvider {
+		provideWorkspaceComments(token: CancellationToken): Promise<CommentThread[]>;
+		createNewCommentThread?(document: TextDocument, range: Range, text: string, token: CancellationToken): Promise<CommentThread>;
+		replyToCommentThread?(document: TextDocument, range: Range, commentThread: CommentThread, text: string, token: CancellationToken): Promise<CommentThread>;
+
+		onDidChangeCommentThreads?: Event<CommentThreadChangedEvent>;
+	}
+
+	namespace workspace {
+		export function registerDocumentCommentProvider(provider: DocumentCommentProvider): Disposable;
+		export function registerWorkspaceCommentProvider(provider: WorkspaceCommentProvider): Disposable;
+	}
+	//#endregion
 
 	//#region Terminal
 

src/vs/workbench/api/electron-browser/extensionHost.contribution.ts

@@ -50,6 +50,7 @@ import './mainThreadTerminalService';
 import './mainThreadTreeViews';
 import './mainThreadLogService';
 import './mainThreadWebview';
+import './mainThreadComments';
 import './mainThreadUrls';
 import './mainThreadWindow';
 import './mainThreadWorkspace';