Merge from vscode 8a997f7321ae6612fc0e6eb3eac4f358a6233bfb

src/vs/editor/standalone/browser/colorizer.ts

@@ -127,6 +127,7 @@ export class Colorizer {
 			0,
 			0,
 			0,
+			0,
 			-1,
 			'none',
 			false,
@@ -197,6 +198,7 @@ function _fakeColorize(lines: string[], tabSize: number): string {
 			0,
 			0,
 			0,
+			0,
 			-1,
 			'none',
 			false,
@@ -236,6 +238,7 @@ function _actualColorize(lines: string[], tabSize: number, tokenizationSupport:
 			0,
 			0,
 			0,
+			0,
 			-1,
 			'none',
 			false,

src/vs/editor/standalone/browser/simpleServices.ts

@@ -84,6 +84,10 @@ export class SimpleModel implements IResolvedTextEditorModel {
 	public isResolved(): boolean {
 		return true;
 	}
+
+	public getMode(): string | undefined {
+		return this.model.getModeId();
+	}
 }
 
 export interface IOpenEditorDelegate {

src/vs/editor/standalone/browser/standaloneCodeEditor.ts

@@ -90,7 +90,7 @@ export interface IGlobalEditorOptions {
 	tabSize?: number;
 	/**
 	 * Insert spaces when pressing `Tab`.
-	 * This setting is overridden based on the file contents when detectIndentation` is on.
+	 * This setting is overridden based on the file contents when `detectIndentation` is on.
 	 * Defaults to true.
 	 */
 	insertSpaces?: boolean;