web - backport some changes

f607c9ba · Benjamin Pasero · a6774a69 · f607c9ba · f607c9ba · f607c9ba
4 changed file
--- a/src/vs/code/browser/workbench/workbench.html
+++ b/src/vs/code/browser/workbench/workbench.html
@@ -3,6 +3,9 @@
 <html>
 	<head>
 		<meta charset="utf-8" />
+
+		<!-- Disable pinch zooming -->
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
 	</head>
 	<body class="vs-dark" aria-label="">
 	</body>

--- a/src/vs/workbench/browser/media/style.css
+++ b/src/vs/workbench/browser/media/style.css
@@ -39,6 +39,10 @@ body {
 	user-select: none;
 }

+body.web {
+	position: fixed; /* prevent bounce effect */
+}
+
 @keyframes fadeIn { from { opacity: 0; } to { opacity: 1; } }

 .monaco-workbench {

--- a/src/vs/workbench/browser/web.simpleservices.ts
+++ b/src/vs/workbench/browser/web.simpleservices.ts
@@ -58,11 +58,11 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { Color, RGBA } from 'vs/base/common/color';
 import { ITunnelService } from 'vs/platform/remote/common/tunnel';
 import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/common/environmentService';
+import { IFileService } from 'vs/platform/files/common/files';

-export const workspaceResource = URI.from({
+export const workspaceResource = URI.file((<any>self).USER_HOME_DIR || '/').with({
 	scheme: Schemas.vscodeRemote,
-	authority: document.location.host,
-	path: '/'
+	authority: document.location.host
 });

 //#region Backup File
@@ -702,7 +702,8 @@ export class SimpleSearchService implements ISearchService {
 	constructor(
 		@IModelService private modelService: IModelService,
 		@IEditorService private editorService: IEditorService,
-		@IUntitledEditorService private untitledEditorService: IUntitledEditorService
+		@IUntitledEditorService private untitledEditorService: IUntitledEditorService,
+		@IFileService private fileService: IFileService
 	) {

 	}
@@ -732,8 +733,8 @@ export class SimpleSearchService implements ISearchService {
 		return Disposable.None;
 	}

-	private getLocalResults(query: ITextQuery): ResourceMap<IFileMatch> {
-		const localResults = new ResourceMap<IFileMatch>();
+	private getLocalResults(query: ITextQuery): ResourceMap<IFileMatch | null> {
+		const localResults = new ResourceMap<IFileMatch | null>();

 		if (query.type === QueryType.Text) {
 			const models = this.modelService.getModels();
@@ -754,10 +755,8 @@ export class SimpleSearchService implements ISearchService {
 					}
 				}

-				// Don't support other resource schemes than files for now
-				// why is that? we should search for resources from other
-				// schemes
-				else if (resource.scheme !== Schemas.file) {
+				// Block walkthrough, webview, etc.
+				else if (!this.fileService.canHandleResource(resource)) {
 					return;
 				}

@@ -766,8 +765,7 @@ export class SimpleSearchService implements ISearchService {
 				}

 				// Use editor API to find matches
-				// @ts-ignore
-				const matches = model.findMatches(query.contentPattern.pattern, false, query.contentPattern.isRegExp, query.contentPattern.isCaseSensitive, query.contentPattern.isWordMatch ? query.contentPattern.wordSeparators : null, false, query.maxResults);
+				const matches = model.findMatches(query.contentPattern.pattern, false, !!query.contentPattern.isRegExp, !!query.contentPattern.isCaseSensitive, query.contentPattern.isWordMatch ? query.contentPattern.wordSeparators! : null, false, query.maxResults);
 				if (matches.length) {
 					const fileMatch = new FileMatch(resource);
 					localResults.set(resource, fileMatch);
@@ -775,7 +773,6 @@ export class SimpleSearchService implements ISearchService {
 					const textSearchResults = editorMatchesToTextSearchResults(matches, model, query.previewOptions);
 					fileMatch.results = addContextToEditorMatches(textSearchResults, model, query);
 				} else {
-					// @ts-ignore
 					localResults.set(resource, null);
 				}
 			});
@@ -785,13 +782,6 @@ export class SimpleSearchService implements ISearchService {
 	}

 	private matches(resource: URI, query: ITextQuery): boolean {
-		// includes
-		if (query.includePattern) {
-			if (resource.scheme !== Schemas.file) {
-				return false; // if we match on file patterns, we have to ignore non file resources
-			}
-		}
-
 		return pathIncludedInQuery(query, resource.fsPath);
 	}
 }

--- a/src/vs/workbench/browser/workbench.ts
+++ b/src/vs/workbench/browser/workbench.ts
@@ -14,7 +14,7 @@ import { getZoomLevel } from 'vs/base/browser/browser';
 import { mark } from 'vs/base/common/performance';
 import { onUnexpectedError, setUnexpectedErrorHandler } from 'vs/base/common/errors';
 import { Registry } from 'vs/platform/registry/common/platform';
-import { isWindows, isLinux } from 'vs/base/common/platform';
+import { isWindows, isLinux, isWeb } from 'vs/base/common/platform';
 import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions';
 import { IEditorInputFactoryRegistry, Extensions as EditorExtensions } from 'vs/workbench/common/editor';
 import { IActionBarRegistry, Extensions as ActionBarExtensions } from 'vs/workbench/browser/actions';
@@ -263,7 +263,11 @@ export class Workbench extends Layout {
 		]);

 		addClasses(this.container, ...workbenchClasses);
-		addClasses(document.body, platformClass); // used by our fonts
+		addClass(document.body, platformClass); // used by our fonts
+
+		if (isWeb) {
+			addClass(document.body, 'web');
+		}

 		// Apply font aliasing
 		this.setFontAliasing(configurationService);