Merge from master

src/vs/platform/issue/common/issue.ts

@@ -3,11 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-'use strict';
-
-import { TPromise } from 'vs/base/common/winjs.base';
 import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
 
 export const IIssueService = createDecorator<IIssueService>('issueService');
 
@@ -22,7 +18,7 @@ export interface WindowData {
 	zoomLevel: number;
 }
 
-export enum IssueType {
+export const enum IssueType {
 	Bug,
 	PerformanceIssue,
 	FeatureRequest,
@@ -45,9 +41,20 @@ export interface IssueReporterStyles extends WindowStyles {
 	sliderActiveColor: string;
 }
 
+export interface IssueReporterExtensionData {
+	name: string;
+	publisher: string;
+	version: string;
+	id: string;
+	isTheme: boolean;
+	displayName: string | undefined;
+	repositoryUrl: string | undefined;
+	bugsUrl: string | undefined;
+}
+
 export interface IssueReporterData extends WindowData {
 	styles: IssueReporterStyles;
-	enabledExtensions: ILocalExtension[];
+	enabledExtensions: IssueReporterExtensionData[];
 	issueType?: IssueType;
 }
 
@@ -74,11 +81,12 @@ export interface ProcessExplorerStyles extends WindowStyles {
 }
 
 export interface ProcessExplorerData extends WindowData {
+	pid: number;
 	styles: ProcessExplorerStyles;
 }
 
 export interface IIssueService {
 	_serviceBrand: any;
-	openReporter(data: IssueReporterData): TPromise<void>;
-	openProcessExplorer(data: ProcessExplorerData): TPromise<void>;
+	openReporter(data: IssueReporterData): Thenable<void>;
+	openProcessExplorer(data: ProcessExplorerData): Thenable<void>;
 }