Move monarch code to vs/editor/common/standalone

build/monaco/monaco.d.ts.recipe

@@ -85,7 +85,7 @@ declare module monaco.languages {
 #includeAll(vs/editor/common/modes/languageConfiguration):
 #includeAll(vs/editor/common/modes;editorCommon.IRange=>IRange;editorCommon.IPosition=>IPosition;editorCommon.=>editor.):
 #include(vs/editor/common/services/modeService): ILanguageExtensionPoint
-#includeAll(vs/editor/common/modes/monarch/monarchTypes):
+#includeAll(vs/editor/common/standalone/monarch/monarchTypes):
 
 }
 

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

@@ -8,7 +8,7 @@
 import { TPromise } from 'vs/base/common/winjs.base';
 import { IDisposable } from 'vs/base/common/lifecycle';
 import { ModesRegistry } from 'vs/editor/common/modes/modesRegistry';
-import { IMonarchLanguage } from 'vs/editor/common/modes/monarch/monarchTypes';
+import { IMonarchLanguage } from 'vs/editor/common/standalone/monarch/monarchTypes';
 import { ILanguageExtensionPoint } from 'vs/editor/common/services/modeService';
 import { StaticServices } from 'vs/editor/browser/standalone/standaloneServices';
 import * as modes from 'vs/editor/common/modes';
@@ -18,8 +18,8 @@ import { Position } from 'vs/editor/common/core/position';
 import { Range } from 'vs/editor/common/core/range';
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { toThenable } from 'vs/base/common/async';
-import { compile } from 'vs/editor/common/modes/monarch/monarchCompile';
-import { createTokenizationSupport } from 'vs/editor/common/modes/monarch/monarchLexer';
+import { compile } from 'vs/editor/common/standalone/monarch/monarchCompile';
+import { createTokenizationSupport } from 'vs/editor/common/standalone/monarch/monarchLexer';
 import { LanguageConfigurationRegistry } from 'vs/editor/common/modes/languageConfigurationRegistry';
 import { IMarkerData } from 'vs/platform/markers/common/markers';
 import { Token, TokenizationResult, TokenizationResult2 } from 'vs/editor/common/core/token';

src/vs/editor/common/modes/monarch/monarchCompile.ts → src/vs/editor/common/standalone/monarch/monarchCompile.ts

@@ -10,8 +10,8 @@
  */
 
 import * as objects from 'vs/base/common/objects';
-import * as monarchCommon from 'vs/editor/common/modes/monarch/monarchCommon';
-import { IMonarchLanguage, IMonarchLanguageBracket } from 'vs/editor/common/modes/monarch/monarchTypes';
+import * as monarchCommon from 'vs/editor/common/standalone/monarch/monarchCommon';
+import { IMonarchLanguage, IMonarchLanguageBracket } from 'vs/editor/common/standalone/monarch/monarchTypes';
 
 /*
  * Type helpers

src/vs/editor/common/modes/monarch/monarchLexer.ts → src/vs/editor/common/standalone/monarch/monarchLexer.ts

@@ -11,7 +11,7 @@
 
 import { IDisposable } from 'vs/base/common/lifecycle';
 import * as modes from 'vs/editor/common/modes';
-import * as monarchCommon from 'vs/editor/common/modes/monarch/monarchCommon';
+import * as monarchCommon from 'vs/editor/common/standalone/monarch/monarchCommon';
 import { IModeService } from 'vs/editor/common/services/modeService';
 import { Token, TokenizationResult, TokenizationResult2 } from 'vs/editor/common/core/token';
 import { NULL_STATE, NULL_MODE_ID } from 'vs/editor/common/modes/nullMode';
@@ -23,7 +23,7 @@ const CACHE_STACK_DEPTH = 5;
 /**
  * Reuse the same stack elements up to a certain depth.
  */
-export class MonarchStackElementFactory {
+class MonarchStackElementFactory {
 
 	private static _INSTANCE = new MonarchStackElementFactory(CACHE_STACK_DEPTH);
 	public static create(parent: MonarchStackElement, state: string): MonarchStackElement {
@@ -59,7 +59,7 @@ export class MonarchStackElementFactory {
 	}
 }
 
-export class MonarchStackElement {
+class MonarchStackElement {
 
 	public readonly parent: MonarchStackElement;
 	public readonly state: string;
@@ -125,7 +125,7 @@ export class MonarchStackElement {
 	}
 }
 
-export class EmbeddedModeData {
+class EmbeddedModeData {
 	public readonly modeId: string;
 	public readonly state: modes.IState;
 
@@ -154,7 +154,7 @@ export class EmbeddedModeData {
 /**
  * Reuse the same line states up to a certain depth.
  */
-export class MonarchLineStateFactory {
+class MonarchLineStateFactory {
 
 	private static _INSTANCE = new MonarchLineStateFactory(CACHE_STACK_DEPTH);
 	public static create(stack: MonarchStackElement, embeddedModeData: EmbeddedModeData): MonarchLineState {
@@ -190,7 +190,7 @@ export class MonarchLineStateFactory {
 	}
 }
 
-export class MonarchLineState implements modes.IState {
+class MonarchLineState implements modes.IState {
 
 	public readonly stack: MonarchStackElement;
 	public readonly embeddedModeData: EmbeddedModeData;
@@ -375,7 +375,7 @@ class MonarchModernTokensCollector implements IMonarchTokensCollector {
 	}
 }
 
-export class MonarchTokenizer implements modes.ITokenizationSupport {
+class MonarchTokenizer implements modes.ITokenizationSupport {
 
 	private readonly _modeService: IModeService;
 	private readonly _standaloneThemeService: IStandaloneThemeService;