Revert "Merge from vscode ada4bddb8edc69eea6ebaaa0e88c5f903cbd43d8 (#5529)" (#5553)

This reverts commit 5d44b6a6a7.

src/vs/base/common/actions.ts

@@ -29,7 +29,7 @@ export interface IActionRunner extends IDisposable {
 	onDidBeforeRun: Event<IRunEvent>;
 }
 
-export interface IActionViewItem {
+export interface IActionItem {
 	actionRunner: IActionRunner;
 	setActionContext(context: any): void;
 	render(element: any /* HTMLElement */): void;

src/vs/base/common/console.ts

@@ -79,7 +79,7 @@ export function getFirstFrame(arg0: IRemoteConsoleLog | string | undefined): ISt
 				uri: URI.file(matches[1]),
 				line: Number(matches[2]),
 				column: Number(matches[3])
-			};
+			} as IStackFrame;
 		}
 	}
 

src/vs/base/common/extpath.ts

@@ -139,22 +139,19 @@ export function isUNC(path: string): boolean {
 }
 
 // Reference: https://en.wikipedia.org/wiki/Filename
-const WINDOWS_INVALID_FILE_CHARS = /[\\/:\*\?"<>\|]/g;
-const UNIX_INVALID_FILE_CHARS = /[\\/]/g;
+const INVALID_FILE_CHARS = isWindows ? /[\\/:\*\?"<>\|]/g : /[\\/]/g;
 const WINDOWS_FORBIDDEN_NAMES = /^(con|prn|aux|clock\$|nul|lpt[0-9]|com[0-9])$/i;
-export function isValidBasename(name: string | null | undefined, isWindowsOS: boolean = isWindows): boolean {
-	const invalidFileChars = isWindowsOS ? WINDOWS_INVALID_FILE_CHARS : UNIX_INVALID_FILE_CHARS;
-
+export function isValidBasename(name: string | null | undefined): boolean {
 	if (!name || name.length === 0 || /^\s+$/.test(name)) {
 		return false; // require a name that is not just whitespace
 	}
 
-	invalidFileChars.lastIndex = 0; // the holy grail of software development
-	if (invalidFileChars.test(name)) {
+	INVALID_FILE_CHARS.lastIndex = 0; // the holy grail of software development
+	if (INVALID_FILE_CHARS.test(name)) {
 		return false; // check for certain invalid file characters
 	}
 
-	if (isWindowsOS && WINDOWS_FORBIDDEN_NAMES.test(name)) {
+	if (isWindows && WINDOWS_FORBIDDEN_NAMES.test(name)) {
 		return false; // check for certain invalid file names
 	}
 
@@ -162,16 +159,16 @@ export function isValidBasename(name: string | null | undefined, isWindowsOS: bo
 		return false; // check for reserved values
 	}
 
-	if (isWindowsOS && name[name.length - 1] === '.') {
+	if (isWindows && name[name.length - 1] === '.') {
 		return false; // Windows: file cannot end with a "."
 	}
 
-	if (isWindowsOS && name.length !== name.trim().length) {
+	if (isWindows && name.length !== name.trim().length) {
 		return false; // Windows: file cannot end with a whitespace
 	}
 
 	if (name.length > 255) {
-		return false; // most file systems do not allow files > 255 length
+		return false; // most file systems do not allow files > 255 lenth
 	}
 
 	return true;

src/vs/base/common/mime.ts

@@ -197,11 +197,7 @@ function guessMimeTypeByFirstline(firstLine: string): string | null {
 	}
 
 	if (firstLine.length > 0) {
-
-		// We want to prioritize associations based on the order they are registered so that the last registered
-		// association wins over all other. This is for https://github.com/Microsoft/vscode/issues/20074
-		for (let i = registeredAssociations.length - 1; i >= 0; i--) {
-			const association = registeredAssociations[i];
+		for (const association of registeredAssociations) {
 			if (!association.firstline) {
 				continue;
 			}
@@ -234,11 +230,10 @@ export function isUnspecific(mime: string[] | string): boolean {
  * 2. Otherwise, if there are other extensions, suggest the first one.
  * 3. Otherwise, suggest the prefix.
  */
-export function suggestFilename(mode: string | undefined, prefix: string): string {
+export function suggestFilename(langId: string | null, prefix: string): string {
 	const extensions = registeredAssociations
-		.filter(assoc => !assoc.userConfigured && assoc.extension && assoc.id === mode)
+		.filter(assoc => !assoc.userConfigured && assoc.extension && assoc.id === langId)
 		.map(assoc => assoc.extension);
-
 	const extensionsWithDotFirst = coalesce(extensions)
 		.filter(assoc => startsWith(assoc, '.'));
 

src/vs/base/common/objects.ts

@@ -14,7 +14,7 @@ export function deepClone<T>(obj: T): T {
 		return obj as any;
 	}
 	const result: any = Array.isArray(obj) ? [] : {};
-	Object.keys(obj as any).forEach((key: string) => {
+	Object.keys(obj).forEach((key: string) => {
 		if (obj[key] && typeof obj[key] === 'object') {
 			result[key] = deepClone(obj[key]);
 		} else {

src/vs/base/common/parsers.ts

@@ -79,7 +79,7 @@ export abstract class Parser {
 		this._problemReporter.fatal(message);
 	}
 
-	protected static merge<T extends object>(destination: T, source: T, overwrite: boolean): void {
+	protected static merge<T>(destination: T, source: T, overwrite: boolean): void {
 		Object.keys(source).forEach((key: string) => {
 			const destValue = destination[key];
 			const sourceValue = source[key];

src/vs/base/common/resources.ts

@@ -176,46 +176,28 @@ export function isAbsolutePath(resource: URI): boolean {
 /**
  * Returns true if the URI path has a trailing path separator
  */
-export function hasTrailingPathSeparator(resource: URI, sep: string = paths.sep): boolean {
+export function hasTrailingPathSeparator(resource: URI): boolean {
 	if (resource.scheme === Schemas.file) {
 		const fsp = originalFSPath(resource);
-		return fsp.length > extpath.getRoot(fsp).length && fsp[fsp.length - 1] === sep;
+		return fsp.length > extpath.getRoot(fsp).length && fsp[fsp.length - 1] === paths.sep;
 	} else {
 		const p = resource.path;
 		return p.length > 1 && p.charCodeAt(p.length - 1) === CharCode.Slash; // ignore the slash at offset 0
 	}
 }
 
+
 /**
- * Removes a trailing path separator, if there's one.
+ * Removes a trailing path seperator, if theres one.
  * Important: Doesn't remove the first slash, it would make the URI invalid
  */
-export function removeTrailingPathSeparator(resource: URI, sep: string = paths.sep): URI {
-	if (hasTrailingPathSeparator(resource, sep)) {
+export function removeTrailingPathSeparator(resource: URI): URI {
+	if (hasTrailingPathSeparator(resource)) {
 		return resource.with({ path: resource.path.substr(0, resource.path.length - 1) });
 	}
 	return resource;
 }
 
-/**
- * Adds a trailing path separator to the URI if there isn't one already.
- * For example, c:\ would be unchanged, but c:\users would become c:\users\
- */
-export function addTrailingPathSeparator(resource: URI, sep: string = paths.sep): URI {
-	let isRootSep: boolean = false;
-	if (resource.scheme === Schemas.file) {
-		const fsp = originalFSPath(resource);
-		isRootSep = ((fsp !== undefined) && (fsp.length === extpath.getRoot(fsp).length) && (fsp[fsp.length - 1] === sep));
-	} else {
-		sep = '/';
-		const p = resource.path;
-		isRootSep = p.length === 1 && p.charCodeAt(p.length - 1) === CharCode.Slash;
-	}
-	if (!isRootSep && !hasTrailingPathSeparator(resource, sep)) {
-		return resource.with({ path: resource.path + '/' });
-	}
-	return resource;
-}
 
 /**
  * Returns a relative path between two URIs. If the URIs don't have the same schema or authority, `undefined` is returned.

src/vs/base/common/strings.ts

@@ -233,7 +233,7 @@ export function regExpLeadsToEndlessLoop(regexp: RegExp): boolean {
 	// We check against an empty string. If the regular expression doesn't advance
 	// (e.g. ends in an endless loop) it will match an empty string.
 	const match = regexp.exec('');
-	return !!(match && regexp.lastIndex === 0);
+	return !!(match && <any>regexp.lastIndex === 0);
 }
 
 export function regExpContainsBackreference(regexpValue: string): boolean {