Reduce standalone editor API breakage

alexdima · alexdima · commit 38912c07c1e8 · 2017-01-09T10:07:25.000+01:00
diff --git a/build/monaco/monaco.d.ts.recipe b/build/monaco/monaco.d.ts.recipe
@@ -72,15 +72,6 @@ declare module monaco.languages {
 
 #includeAll(vs/editor/browser/standalone/standaloneLanguages;modes.=>;editorCommon.=>editor.;IMarkerData=>editor.IMarkerData):
 #includeAll(vs/editor/common/modes/languageConfiguration):
-/**
- * An identifier for a registered language.
- */
-export class LanguageIdentifier {
-	public readonly language: string;
-	public readonly id: number;
-
-	constructor(language: string, id: number);
-}
 #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):
diff --git a/src/vs/editor/browser/standalone/standaloneLanguages.ts b/src/vs/editor/browser/standalone/standaloneLanguages.ts
@@ -645,8 +645,5 @@ export function createMonacoLanguagesAPI(): typeof monaco.languages {
 		CompletionItemKind: CompletionItemKind,
 		SymbolKind: modes.SymbolKind,
 		IndentAction: IndentAction,
-
-		// classes
-		LanguageIdentifier: modes.LanguageIdentifier
 	};
 }
diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts
@@ -1818,9 +1818,15 @@ export interface IReadOnlyModel extends ITextModel {
 
 	/**
 	 * Get the language associated with this model.
+	 * @internal
 	 */
 	getLanguageIdentifier(): LanguageIdentifier;
 
+	/**
+	 * Get the language associated with this model.
+	 */
+	getModeId(): string;
+
 	/**
 	 * Get the word under or besides `position`.
 	 * @param position The position to look for a word.
@@ -1863,9 +1869,15 @@ export interface ITokenizedModel extends ITextModel {
 
 	/**
 	 * Get the language associated with this model.
+	 * @internal
 	 */
 	getLanguageIdentifier(): LanguageIdentifier;
 
+	/**
+	 * Get the language associated with this model.
+	 */
+	getModeId(): string;
+
 	/**
 	 * Set the current language mode associated with the model.
 	 * @internal
@@ -2222,11 +2234,11 @@ export interface IModelLanguageChangedEvent {
 	/**
 	 * Previous language
 	 */
-	readonly oldLanguageIdentifier: LanguageIdentifier;
+	readonly oldLanguage: string;
 	/**
 	 * New language
 	 */
-	readonly newLanguageIdentifier: LanguageIdentifier;
+	readonly newLanguage: string;
 }
 
 /**
diff --git a/src/vs/editor/common/model/textModelWithTokens.ts b/src/vs/editor/common/model/textModelWithTokens.ts
@@ -190,15 +190,19 @@ export class TextModelWithTokens extends TextModel implements editorCommon.IToke
 		return this._languageIdentifier;
 	}
 
+	public getModeId(): string {
+		return this._languageIdentifier.language;
+	}
+
 	public setMode(languageIdentifier: LanguageIdentifier): void {
 		if (this._languageIdentifier.id === languageIdentifier.id) {
 			// There's nothing to do
 			return;
 		}
 
 		let e: editorCommon.IModelLanguageChangedEvent = {
-			oldLanguageIdentifier: this._languageIdentifier,
-			newLanguageIdentifier: languageIdentifier
+			oldLanguage: this._languageIdentifier.language,
+			newLanguage: languageIdentifier.language
 		};
 
 		this._languageIdentifier = languageIdentifier;
diff --git a/src/vs/editor/common/services/modelServiceImpl.ts b/src/vs/editor/common/services/modelServiceImpl.ts
@@ -479,7 +479,7 @@ export class ModelServiceImpl implements IModelService {
 			if (e.getType() === editorCommon.EventType.ModelLanguageChanged) {
 				this._onModelModeChanged.fire({
 					model: modelData.model,
-					oldModeId: (<editorCommon.IModelLanguageChangedEvent>e.getData()).oldLanguageIdentifier.language
+					oldModeId: (<editorCommon.IModelLanguageChangedEvent>e.getData()).oldLanguage
 				});
 			}
 		}
diff --git a/src/vs/monaco.d.ts b/src/vs/monaco.d.ts
@@ -2077,7 +2077,7 @@ declare module monaco.editor {
         /**
          * Get the language associated with this model.
          */
-        getLanguageIdentifier(): languages.LanguageIdentifier;
+        getModeId(): string;
         /**
          * Get the word under or besides `position`.
          * @param position The position to look for a word.
@@ -2101,7 +2101,7 @@ declare module monaco.editor {
         /**
          * Get the language associated with this model.
          */
-        getLanguageIdentifier(): languages.LanguageIdentifier;
+        getModeId(): string;
         /**
          * Get the word under or besides `position`.
          * @param position The position to look for a word.
@@ -2286,11 +2286,11 @@ declare module monaco.editor {
         /**
          * Previous language
          */
-        readonly oldLanguageIdentifier: languages.LanguageIdentifier;
+        readonly oldLanguage: string;
         /**
          * New language
          */
-        readonly newLanguageIdentifier: languages.LanguageIdentifier;
+        readonly newLanguage: string;
     }
 
     /**
@@ -4278,15 +4278,6 @@ declare module monaco.languages {
          */
         removeText?: number;
     }
-    /**
-     * An identifier for a registered language.
-     */
-    export class LanguageIdentifier {
-        public readonly language: string;
-        public readonly id: number;
-
-        constructor(language: string, id: number);
-    }
 
     /**
      * The state of the tokenizer between two lines.

Original file line number	Diff line number	Diff line change
`@@ -645,8 +645,5 @@ export function createMonacoLanguagesAPI(): typeof monaco.languages {`
`645`	`645`	`CompletionItemKind: CompletionItemKind,`
`646`	`646`	`SymbolKind: modes.SymbolKind,`
`647`	`647`	`IndentAction: IndentAction,`
`648`		`-`
`649`		`- // classes`
`650`		`- LanguageIdentifier: modes.LanguageIdentifier`
`651`	`648`	`};`
`652`	`649`	`}`
Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ export class ModelServiceImpl implements IModelService {`
`479`	`479`	`if (e.getType() === editorCommon.EventType.ModelLanguageChanged) {`
`480`	`480`	`this._onModelModeChanged.fire({`
`481`	`481`	`model: modelData.model,`
`482`		`- oldModeId: (<editorCommon.IModelLanguageChangedEvent>e.getData()).oldLanguageIdentifier.language`
	`482`	`+ oldModeId: (<editorCommon.IModelLanguageChangedEvent>e.getData()).oldLanguage`
`483`	`483`	`});`
`484`	`484`	`}`
`485`	`485`	`}`