a bit more monaco => code

src/vs/base/browser/ui/actionbar/actionbar.ts

@@ -193,7 +193,7 @@ export class BaseActionItem extends EventEmitter implements IActionItem {
 
 export class Separator extends Action {
 
-	public static ID = 'actions.monaco.separator';
+	public static ID = 'vs.actions.separator';
 
 	constructor(label?: string, order?) {
 		super(Separator.ID, label, label ? 'separator text' : 'separator');

src/vs/workbench/browser/actionBarRegistry.ts

@@ -268,7 +268,7 @@ export interface IActionBarRegistry {
 
 	/**
 	 * Registers an Actionbar contributor. It will be called to contribute actions to all the action bars
-	 * that are used in the Monaco Workbench in the given scope.
+	 * that are used in the Workbench in the given scope.
 	 */
 	registerActionBarContributor(scope: string, ctor: IConstructorSignature0<ActionBarContributor>): void;
 

src/vs/workbench/browser/composite.ts

@@ -60,7 +60,7 @@ export abstract class Composite extends WorkbenchComponent implements IComposite
 	}
 
 	/**
-	 * Note: Clients should not call this method, the monaco workbench calls this
+	 * Note: Clients should not call this method, the workbench calls this
 	 * method. Calling it otherwise may result in unexpected behavior.
 	 *
 	 * Called to create this composite on the provided builder. This method is only
@@ -82,7 +82,7 @@ export abstract class Composite extends WorkbenchComponent implements IComposite
 	}
 
 	/**
-	 * Note: Clients should not call this method, the monaco workbench calls this
+	 * Note: Clients should not call this method, the workbench calls this
 	 * method. Calling it otherwise may result in unexpected behavior.
 	 *
 	 * Called to indicate that the composite has become visible or hidden. This method
@@ -193,7 +193,7 @@ export abstract class Composite extends WorkbenchComponent implements IComposite
 }
 
 /**
- * A composite descriptor is a leightweight descriptor of a composite in the monaco workbench.
+ * A composite descriptor is a leightweight descriptor of a composite in the workbench.
  */
 export abstract class CompositeDescriptor<T extends Composite> extends AsyncDescriptor<T> {
 	public id: string;

src/vs/workbench/browser/layout.ts

@@ -48,7 +48,7 @@ interface ComputedStyles {
 }
 
 /**
- * The workbench layout is responsible to lay out all parts that make the Monaco Workbench.
+ * The workbench layout is responsible to lay out all parts that make the Workbench.
  */
 export class WorkbenchLayout implements IVerticalSashLayoutProvider, IHorizontalSashLayoutProvider {
 

src/vs/workbench/browser/panel.ts

@@ -10,7 +10,7 @@ import {Composite, CompositeDescriptor, CompositeRegistry} from 'vs/workbench/br
 export abstract class Panel extends Composite implements IPanel { }
 
 /**
- * A panel descriptor is a leightweight descriptor of a panel in the monaco workbench.
+ * A panel descriptor is a leightweight descriptor of a panel in the workbench.
  */
 export class PanelDescriptor extends CompositeDescriptor<Panel> {
 	constructor(moduleId: string, ctorName: string, id: string, name: string, cssClass?: string) {

src/vs/workbench/browser/part.ts

@@ -25,7 +25,7 @@ export abstract class Part extends WorkbenchComponent {
 	}
 
 	/**
-	 * Note: Clients should not call this method, the monaco workbench calls this
+	 * Note: Clients should not call this method, the workbench calls this
 	 * method. Calling it otherwise may result in unexpected behavior.
 	 *
 	 * Called to create title, content and status area of the part.

src/vs/workbench/browser/parts/editor/baseEditor.ts

@@ -62,7 +62,7 @@ export abstract class BaseEditor extends Panel implements IEditor {
 	}
 
 	/**
-	 * Note: Clients should not call this method, the monaco workbench calls this
+	 * Note: Clients should not call this method, the workbench calls this
 	 * method. Calling it otherwise may result in unexpected behavior.
 	 *
 	 * Sets the given input with the options to the part. An editor has to deal with the

src/vs/workbench/browser/parts/editor/stringEditor.ts

@@ -27,7 +27,7 @@ import {IThemeService} from 'vs/workbench/services/themes/common/themeService';
 
 /**
  * An editor implementation that is capable of showing string inputs or promise inputs that resolve to a string.
- * Uses the Monaco TextEditor widget to show the contents.
+ * Uses the TextEditor widget to show the contents.
  */
 export class StringEditor extends BaseTextEditor {
 

src/vs/workbench/browser/parts/editor/textDiffEditor.ts

@@ -40,7 +40,7 @@ import {IKeybindingService, IKeybindingContextKey} from 'vs/platform/keybinding/
 import {IThemeService} from 'vs/workbench/services/themes/common/themeService';
 
 /**
- * The text editor that leverages the monaco diff text editor for the editing experience.
+ * The text editor that leverages the diff text editor for the editing experience.
  */
 export class TextDiffEditor extends BaseTextEditor {
 

src/vs/workbench/browser/parts/editor/textEditor.ts

@@ -33,7 +33,7 @@ import {IThemeService} from 'vs/workbench/services/themes/common/themeService';
 const EDITOR_VIEW_STATE_PREFERENCE_KEY = 'editorViewState';
 
 /**
- * The base class of editors that leverage the monaco text editor for the editing experience. This class is only intended to
+ * The base class of editors that leverage the text editor for the editing experience. This class is only intended to
  * be subclassed and not instantiated.
  */
 export abstract class BaseTextEditor extends BaseEditor {

src/vs/workbench/browser/viewlet.ts

@@ -148,7 +148,7 @@ export abstract class ViewerViewlet extends Viewlet {
 }
 
 /**
- * A viewlet descriptor is a leightweight descriptor of a viewlet in the monaco workbench.
+ * A viewlet descriptor is a leightweight descriptor of a viewlet in the workbench.
  */
 export class ViewletDescriptor extends CompositeDescriptor<Viewlet> { }
 

src/vs/workbench/browser/workbench.ts

@@ -76,7 +76,7 @@ export interface IWorkbenchCallbacks {
 }
 
 /**
- * The workbench creates and lays out all parts that make up the Monaco Workbench.
+ * The workbench creates and lays out all parts that make up the workbench.
  */
 export class Workbench implements IPartService {
 

src/vs/workbench/common/editor/textEditorModel.ts

@@ -15,7 +15,7 @@ import {IModelService} from 'vs/editor/common/services/modelService';
 import {RawText} from 'vs/editor/common/model/textModel';
 
 /**
- * The base text editor model leverages the monaco code editor model. This class is only intended to be subclassed and not instantiated.
+ * The base text editor model leverages the code editor model. This class is only intended to be subclassed and not instantiated.
  */
 export abstract class BaseTextEditorModel extends EditorModel implements ITextEditorModel {
 	private textEditorModelHandle: URI;

src/vs/workbench/common/events.ts

@@ -12,7 +12,7 @@ import {EditorInput, EditorOptions} from 'vs/workbench/common/editor';
 import {Position} from 'vs/platform/editor/common/editor';
 
 /**
- * All workbench events are listed here. For DOM events, see Monaco.Base.DomUtils.EventType.
+ * All workbench events are listed here.
  */
 export class EventType {
 

src/vs/workbench/electron-browser/shell.ts

@@ -86,7 +86,7 @@ export interface ICoreServices {
 }
 
 /**
- * The Monaco Workbench Shell contains the Monaco workbench with a rich header containing navigation and the activity bar.
+ * The workbench shell contains the workbench with a rich header containing navigation and the activity bar.
  * With the Shell being the top level element in the page, it is also responsible for driving the layouting.
  */
 export class WorkbenchShell {
@@ -443,7 +443,6 @@ export class WorkbenchShell {
 		}
 
 		this.contextViewService.dispose();
-		this.storageService.dispose();
 
 		// Listeners
 		this.toUnbind = dispose(this.toUnbind);

src/vs/workbench/electron-browser/window.ts

@@ -68,7 +68,7 @@ export class ElectronWindow {
 			e.preventDefault();
 		});
 
-		// Let a dropped file open inside Monaco (only if dropped over editor area)
+		// Let a dropped file open inside Code (only if dropped over editor area)
 		window.document.body.addEventListener('drop', (e: DragEvent) => {
 			e.preventDefault();
 

src/vs/workbench/node/extensionHostMain.ts

@@ -72,7 +72,7 @@ export function createServices(remoteCom: IMainProcessExtHostIPC, initData: IIni
 	let instantiationService = new InstantiationService(services, true);
 	threadService.setInstantiationService(instantiationService);
 
-	// Create the monaco API
+	// Create the ext host API
 	instantiationService.createInstance(ExtHostAPIImplementation);
 
 	return instantiationService;

src/vs/workbench/parts/git/browser/gitEditorContributions.ts

@@ -76,7 +76,7 @@ class MergeDecoratorBoundToModel extends Disposable {
 
 export class MergeDecorator implements common.IEditorContribution {
 
-	static ID = 'Monaco.IDE.UI.Viewlets.GitViewlet.Editor.MergeDecorator';
+	static ID = 'vs.git.editor.merge.decorator';
 	static DECORATION_OPTIONS:common.IModelDecorationOptions = {
 		className: 'git-merge-control-decoration',
 		isWholeLine: true,

src/vs/workbench/parts/git/browser/gitEditorInputs.ts

@@ -66,7 +66,7 @@ export class GitDiffEditorInput
 
 export class GitWorkingTreeDiffEditorInput extends GitDiffEditorInput {
 
-	static ID = 'Monaco.IDE.UI.Viewlets.GitViewlet.GitWorkingTreeDiffEditorInput';
+	static ID = 'vs.git.workingTreeDiffInput';
 
 	constructor(name:string, description:string, originalInput:WorkbenchEditorCommon.EditorInput, modifiedInput:WorkbenchEditorCommon.EditorInput, status:git.IFileStatus) {
 		super(name, description, originalInput, modifiedInput, status);
@@ -79,7 +79,7 @@ export class GitWorkingTreeDiffEditorInput extends GitDiffEditorInput {
 
 export class GitIndexDiffEditorInput extends GitDiffEditorInput {
 
-	static ID:string = 'Monaco.IDE.UI.Viewlets.GitViewlet.GitIndexDiffEditorInput';
+	static ID:string = 'vs.git.indexDiffInput';
 
 	constructor(name:string, description:string, originalInput:WorkbenchEditorCommon.EditorInput, modifiedInput:WorkbenchEditorCommon.EditorInput, status:git.IFileStatus) {
 		super(name, description, originalInput, modifiedInput, status);
@@ -94,7 +94,7 @@ export class NativeGitIndexStringEditorInput
 	extends stringei.StringEditorInput
 	implements IEditorInputWithStatus
 {
-	public static ID = 'Monaco.IDE.UI.Viewlets.GitViewlet.NativeGitIndexStringEditorInput';
+	public static ID = 'vs.git.stringEditorInput';
 
 	private gitService: IGitService;
 	private editorService: IWorkbenchEditorService;

src/vs/workbench/parts/git/browser/gitOutput.ts

@@ -12,7 +12,7 @@ import { IOutputService } from 'vs/workbench/parts/output/common/output';
 
 export class GitOutput implements IWorkbenchContribution {
 
-	static ID = 'Monaco.IDE.UI.Viewlets.GitViewlet.Workbench.GitOutput';
+	static ID = 'vs.git.output';
 
 	private outputListener: IDisposable;
 	private gitService: IGitService;

src/vs/workbench/parts/git/browser/gitServices.ts

@@ -376,9 +376,8 @@ export class GitService extends ee.EventEmitter
 	implements
 		git.IGitService {
 
-	static ID = 'Monaco.IDE.UI.Services.GitService';
-
 	public serviceId = git.IGitService;
+	
 	private eventService: IEventService;
 	private contextService: IWorkspaceContextService;
 	private messageService: IMessageService;

src/vs/workbench/parts/git/browser/gitWorkbenchContributions.ts

@@ -46,7 +46,7 @@ import IGitService = git.IGitService;
 
 export class StatusUpdater implements ext.IWorkbenchContribution
 {
-	static ID = 'Monaco.IDE.UI.Viewlets.GitViewlet.Workbench.StatusUpdater';
+	static ID = 'vs.git.statusUpdater';
 
 	private gitService: IGitService;
 	private eventService: IEventService;
@@ -108,7 +108,7 @@ export class StatusUpdater implements ext.IWorkbenchContribution
 class DirtyDiffModelDecorator {
 	static GIT_ORIGINAL_SCHEME = 'git-index';
 
-	static ID = 'Monaco.IDE.UI.Viewlets.GitViewlet.Editor.DirtyDiffDecorator';
+	static ID = 'vs.git.editor.dirtyDiffDecorator';
 	static MODIFIED_DECORATION_OPTIONS: common.IModelDecorationOptions = {
 		linesDecorationsClassName: 'git-dirty-modified-diff-glyph',
 		isWholeLine: true,

src/vs/workbench/parts/output/common/output.ts

@@ -13,7 +13,7 @@ import {IEditor} from 'vs/platform/editor/common/editor';
 /**
  * Mime type used by the output editor.
  */
-export const OUTPUT_MIME = 'text/x-monaco-output';
+export const OUTPUT_MIME = 'text/x-code-output';
 
 /**
  * Id used by the output editor.

src/vs/workbench/parts/output/common/outputMode.ts

@@ -28,7 +28,7 @@ export const language: types.ILanguage = {
 	tokenizer: {
 		root: [
 
-			// Monaco log levels
+			// Log levels
 			[/^\[trace.*?\]|trace:?/, 'debug-token.output'],
 			[/^\[http.*?\]|http:?/, 'debug-token.output'],
 			[/^\[debug.*?\]|debug:?/, 'debug-token.output'],