Merge branch 'master' into joh/registerTextDocumentProvider

src/vs/base/browser/ui/countBadge/countBadge.css

@@ -4,16 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 .monaco-count-badge {
-	min-width: 18px;
-	padding: 0 3px;
-	margin: 4px 13px 0 6px;
-	border-radius: 8px;
-	font-size: 11px;
-	line-height: 16px;
+	padding: 0.2em 0.4em;
+	border-radius: 1em;
+	font-size: 80%;
 	font-weight: normal;
 	text-align: center;
 	background: #BEBEBE;
 	color: #FFF;
+	display: inline;
 }
 
 .vs-dark .monaco-count-badge {

src/vs/editor/contrib/referenceSearch/browser/referenceSearchWidget.css

@@ -112,6 +112,10 @@
 	background-color: rgba(234, 92, 0, 0.3);
 }
 
+.monaco-editor .reference-zone-widget .monaco-count-badge {
+	margin-right: 12px;
+}
+
 /* dark room */
 
 .monaco-editor.vs-dark .reference-zone-widget .tree .block,

src/vs/vscode.d.ts

@@ -3388,8 +3388,8 @@ declare namespace vscode {
 	}
 }
 
-// TS 1.6 & node_module
-// export = vscode;
+// [javascript start marker]
+// DO NOT MODIFY ABOVE COMMENT
 
 // when used for JS*
 declare module 'vscode' {

src/vs/workbench/parts/extensions/node/extensionsService.ts

@@ -127,7 +127,7 @@ export class ExtensionsService implements IExtensionsService {
 
 		const settings = TPromise.join([
 			UserSettings.getValue(this.contextService, 'http.proxy'),
-			UserSettings.getValue(this.contextService, 'http.proxy.strictSSL')
+			UserSettings.getValue(this.contextService, 'http.proxyStrictSSL')
 		]);
 
 		return settings

src/vs/workbench/parts/git/browser/views/changes/changesView.css

@@ -65,9 +65,9 @@
 	cursor: default;
 }
 
-.git-viewlet > .changes-view > .status-view > .monaco-tree .monaco-tree-row .monaco-count-badge {
+.git-viewlet > .changes-view > .status-view > .monaco-tree .monaco-tree-row .count-badge-wrapper {
 	float: right;
-	margin-right: 12px;
+	padding-right: 12px;
 }
 
 .git-viewlet > .changes-view > .status-view > .monaco-tree .monaco-tree-row:hover .monaco-count-badge {
@@ -89,21 +89,17 @@
 }
 
 .git-viewlet > .changes-view > .status-view > .monaco-tree .monaco-tree-row .file-status .status {
-	position: absolute;
-	top: 4px;
-	height: 12px;
-	width: 6px;
-	line-height: 12px;
 	padding: 2px 4px;
 	font-family: Menlo, Monaco, Consolas, "Droid Sans Mono", "Inconsolata", "Courier New", monospace, "Droid Sans Fallback";
-	font-size: 9px;
+	font-size: 70%;
 	color: white;
 	text-align: center;
-	border-radius: 4px;
+	border-radius: 0.5em;
+	vertical-align: bottom;
 }
 
 .git-viewlet > .changes-view > .status-view > .monaco-tree .monaco-tree-row .file-status .name {
-	margin-left: 20px;
+	margin-left: 0.4em;
 }
 
 .git-viewlet > .changes-view > .status-view > .monaco-tree .monaco-tree-row .file-status.modified .status	{ background-color: #007ACC; }

src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts

@@ -269,7 +269,10 @@ export class Renderer implements tree.IRenderer {
 		data.actionBar = new actionbar.ActionBar(container, { actionRunner: this.actionRunner });
 		data.actionBar.push(this.actionProvider.getActionsForGroupStatusType(statusType), { icon: true, label: false });
 		data.actionBar.addListener2('run', e => e.error && this.onError(e.error));
-		data.count = new countbadge.CountBadge(container);
+
+		const wrapper = dom.append(container, $('.count-badge-wrapper'));
+		data.count = new countbadge.CountBadge(wrapper);
+
 		data.root = dom.append(container, $('.status-group'));
 
 		switch (statusType) {

src/vs/workbench/parts/git/electron-browser/electronGitService.ts

@@ -52,7 +52,14 @@ function findGitDarwin(): Promise {
 					return e('git not found');
 				}
 
-				return c(gitPath);
+				// make sure git executes
+				exec('git --version', err => {
+					if (err) {
+						return e('git not found');
+					}
+
+					return c(gitPath);
+				});
 			});
 		});
 	});

src/vs/workbench/parts/search/browser/media/searchviewlet.css

@@ -158,6 +158,10 @@
 	font-style: italic;
 }
 
+.search-viewlet .monaco-count-badge {
+	margin-right: 12px;
+}
+
 .vs .search-viewlet input.disabled,
 .vs .search-viewlet .file-types.disabled .monaco-inputbox {
 	background-color: #E1E1E1;