Merge branch 'master' into misolori/web-dropdowns

src/vs/base/browser/browser.ts

@@ -120,6 +120,7 @@ export const isWebKit = (userAgent.indexOf('AppleWebKit') >= 0);
 export const isChrome = (userAgent.indexOf('Chrome') >= 0);
 export const isSafari = (!isChrome && (userAgent.indexOf('Safari') >= 0));
 export const isWebkitWebView = (!isChrome && !isSafari && isWebKit);
+export const isTouchDevice = 'ontouchstart' in window as any || navigator.maxTouchPoints > 0 || window.navigator.msMaxTouchPoints > 0;
 export const isIPad = (userAgent.indexOf('iPad') >= 0);
 export const isEdgeWebView = isEdge && (userAgent.indexOf('WebView/') >= 0);
 export const isStandalone = (window.matchMedia && window.matchMedia('(display-mode: standalone)').matches);

src/vs/editor/contrib/hover/hover.ts

@@ -259,19 +259,19 @@ class ShowHoverAction extends EditorAction {
 	}
 }
 
-class ShowCtrlHoverAction extends EditorAction {
+class ShowDefinitionPreviewHoverAction extends EditorAction {
 
 	constructor() {
 		super({
-			id: 'editor.action.showCtrlHover',
+			id: 'editor.action.showDefinitionPreviewHover',
 			label: nls.localize({
-				key: 'showCtrlHover',
+				key: 'showDefinitionPreviewHover',
 				comment: [
-					'Label for action that will trigger the showing of a ctrl+hover in the editor.',
-					'This allows for users to show the ctrl+hover without using the mouse.'
+					'Label for action that will trigger the showing of definition preview hover in the editor.',
+					'This allows for users to show the definition preview hover without using the mouse.'
 				]
-			}, "Show Control Hover"),
-			alias: 'Show Control Hover',
+			}, "Show Definition Preview Hover"),
+			alias: 'Show Definition Preview Hover',
 			precondition: undefined
 		});
 	}
@@ -302,7 +302,7 @@ class ShowCtrlHoverAction extends EditorAction {
 
 registerEditorContribution(ModesHoverController.ID, ModesHoverController);
 registerEditorAction(ShowHoverAction);
-registerEditorAction(ShowCtrlHoverAction);
+registerEditorAction(ShowDefinitionPreviewHoverAction);
 
 // theming
 registerThemingParticipant((theme, collector) => {