Merge remote-tracking branch 'origin/master' into pr/jerdog/1114

CONTRIBUTING.md

@@ -21,7 +21,7 @@ These packages are described in the root file called `metadata.js` and it is pos
 
 ## Running the editor from source
 
-You need to have all the build setup of being able to build VS Code to be able to build the Monaco Editor.
+You need to have all the build setup of VS Code to be able to build the Monaco Editor.
 
 * Install all the prerequisites: https://github.com/Microsoft/vscode/wiki/How-to-Contribute#installing-prerequisites
 

README.md

@@ -26,9 +26,9 @@ It is recommended to develop against the `dev` version, and in production to use
 ## Documentation
 
 * Learn how to integrate the editor with these [complete samples](https://github.com/Microsoft/monaco-editor-samples/).
-	* [Integrate the AMD version](./docs/integrate-amd.md).
-	* [Integrate the AMD version cross-domain](./docs/integrate-amd-cross.md)
-	* [Integrate the ESM version](./docs/integrate-esm.md)
+    * [Integrate the AMD version](./docs/integrate-amd.md).
+    * [Integrate the AMD version cross-domain](./docs/integrate-amd-cross.md)
+    * [Integrate the ESM version](./docs/integrate-esm.md)
 * Learn how to use the editor API and try out your own customizations in the [playground](https://microsoft.github.io/monaco-editor/playground.html).
 * Explore the [API docs](https://microsoft.github.io/monaco-editor/api/index.html) or read them straight from [`monaco.d.ts`](https://github.com/Microsoft/monaco-editor/blob/master/website/playground/monaco.d.ts.txt).
 * Read [this guide](https://github.com/Microsoft/monaco-editor/wiki/Accessibility-Guide-for-Integrators) to ensure the editor is accessible to all your users!
@@ -37,11 +37,10 @@ It is recommended to develop against the `dev` version, and in production to use
 
 ## Issues
 
-Create [issues](https://github.com/Microsoft/monaco-editor/issues) in this repository for anything related to Monaco Editor. Always mention **the version** of the editor when creating issues and **the browser** you're having trouble in. Please search for existing issues to avoid duplicates.
+Create [issues](https://github.com/Microsoft/monaco-editor/issues) in this repository for anything related to the Monaco Editor. Always mention **the version** of the editor when creating issues and **the browser** you're having trouble in. Please search for existing issues to avoid duplicates.
 
 ## Known issues
-In IE 11, the editor must be completely surrounded in the body element, otherwise the hit testing performed for mouse operations does not work. You can inspect this using F12 and clicking on the body element and confirm that visually it surrounds the editor.
-
+In IE 11, the editor must be surrounded in the body element, otherwise the hit testing performed for mouse operations does not work. You can inspect this using F12 and click on the body element and confirm that visually it surrounds the editor.
 
 ## FAQ
 
@@ -61,7 +60,7 @@ No.
 
 ❓ **Why all these web workers and why should I care?**
 
-Language services create web workers to compute heavy stuff outside the UI thread. They cost hardly anything in terms of resource overhead and you shouldn't worry too much about them, as long as you get them to work (see above the cross-domain case).
+Language services create web workers to compute heavy stuff outside of the UI thread. They cost hardly anything in terms of resource overhead and you shouldn't worry too much about them, as long as you get them to work (see above the cross-domain case).
 
 ❓ **What is this `loader.js`? Can I use `require.js`?**
 
@@ -69,7 +68,7 @@ It is an AMD loader that we use in VS Code. Yes.
 
 ❓ **I see the warning "Could not create web worker". What should I do?**
 
-HTML5 does not allow pages loaded on `file://` to create web workers. Please load the editor with a web server on `http://` or `https://` schemes. Please also see the cross domain case above.
+HTML5 does not allow pages loaded on `file://` to create web workers. Please load the editor with a web server on `http://` or `https://` schemes. Please also see the cross-domain case above.
 
 ❓ **Is the editor supported in mobile browsers or mobile web app frameworks?**
 

website/index.html

@@ -85,7 +85,7 @@
 					<br>
 					<h4 title="Syntax colorization">Basic Syntax Colorization</h4>
 					<p>XML, PHP, C#, C++, Razor, Markdown, Diff, Java, VB, CoffeeScript, Handlebars, Batch, Pug, F#, Lua, Powershell,
-						Python, SASS, R, Objective-C</p>
+						Python, Ruby, SASS, R, Objective-C</p>
 					<br>
 					<p>Colorizers are implemented using <a href="monarch.html"
 						target="_blank">Monarch</a>.</p>

website/monarch.html

@@ -152,7 +152,6 @@ delimiter .[curly,square,parenthesis,angle,array,bracket]
 number    .[hex,octal,binary,float]
 variable  .[name,value]
 meta      .[content]</pre>
-    <p>Note: The token classes in the third column are currently only highlighted correctly if you include the <code>monarch.css</code> style file (Aug 2012).</p>
 
     <h3>States</h3>
     <p>A tokenizer consists of an object that defines states. The initial state of the tokenizer is the first state defined in the tokenizer. When a tokenizer is in a certain state, only the rules in that state will be applied. All rules are matched in order and when the first one matches its action is used to determine the token class. No further rules are tried. Therefore, it can

website/monarch/monarch.js

@@ -84,14 +84,6 @@ function readSamples(sampleSelect) {
 
 		var languageId = 'monarch-language-' + id;
 
-		// monaco.languages.register({ id: languageId });
-
-		// var langModel = monaco.editor.createModel(getTextFromId(id), 'javascript');
-		// var update = function() {
-		// 	console.log()
-		// };
-		// langModel.onDidChangeContent(update);
-
 		var sampleText = getTextFromId(id + "-sample");
 
 		samples[id] = {