Starts tokenizing at the row indicated. Returns a list of objects of the tokenized rows.
diff --git a/doc/resources/ace/templates/layout.jade b/doc/resources/ace/templates/layout.jade
index da6c2226..68864969 100644
--- a/doc/resources/ace/templates/layout.jade
+++ b/doc/resources/ace/templates/layout.jade
@@ -3,7 +3,7 @@ include lib
#documentation.span8
-if (isIndex)
- != content
+ != indexContent
-else
mixin api()
diff --git a/doc/site/images/sassmeister-logo.png b/doc/site/images/sassmeister-logo.png
new file mode 100644
index 00000000..7ecc8939
Binary files /dev/null and b/doc/site/images/sassmeister-logo.png differ
diff --git a/doc/site/images/spandexio-logo.png b/doc/site/images/spandexio-logo.png
new file mode 100644
index 00000000..e2fdb79d
Binary files /dev/null and b/doc/site/images/spandexio-logo.png differ
diff --git a/index.html b/index.html
index 019cdb76..d9f52317 100644
--- a/index.html
+++ b/index.html
@@ -504,6 +504,16 @@ tests for the highlighting.
style="position: relative; left: 3px;top: 23px;width: 97px;" />
Kera.io
+
+ 
+ SassMeister
+
+
+ 
+ SpanDeX.io
+
Sky Edit
diff --git a/lib/ace/css/editor.css b/lib/ace/css/editor.css
index 1b63ee16..c3a7fc8e 100644
--- a/lib/ace/css/editor.css
+++ b/lib/ace/css/editor.css
@@ -242,6 +242,8 @@
-webkit-box-sizing: border-box;
box-sizing: border-box;
cursor: default;
+ white-space: pre-line;
+ word-wrap: break-word;
}
.ace_folding-enabled > .ace_gutter-cell {
diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index d8578d03..a739b677 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -318,7 +318,7 @@ var EditSession = function(text, mode) {
};
/**
- * EditSession.getSelection() -> String
+ * EditSession.getSelection() -> Selection
*
* Returns the string of the current selection.
**/
@@ -349,11 +349,11 @@ var EditSession = function(text, mode) {
};
/**
- * EditSession.getTokenAt(row, column) -> Array
+ * EditSession.getTokenAt(row, column) -> Object
* - row (Number): The row number to retrieve from
* - column (Number): The column number to retrieve from
*
- * Returns an array of tokens at the indicated row and column.
+ * Returns an object indicating the token at the current row. The object has two properties: `index` and `start`.
**/
this.getTokenAt = function(row, column) {
var tokens = this.bgTokenizer.getTokens(row);
@@ -1204,8 +1204,8 @@ var EditSession = function(text, mode) {
};
/** related to: Document.getTextRange
- * EditSession.getTextRange(range) -> Array
- * - range (String): The range to work with
+ * EditSession.getTextRange(range) -> String
+ * - range (Range): The range to work with
*
* {:Document.getTextRange.desc}
**/
diff --git a/lib/ace/layer/gutter.js b/lib/ace/layer/gutter.js
index 558cd026..99fec7b6 100644
--- a/lib/ace/layer/gutter.js
+++ b/lib/ace/layer/gutter.js
@@ -33,6 +33,7 @@ define(function(require, exports, module) {
var dom = require("../lib/dom");
var oop = require("../lib/oop");
+var lang = require("../lib/lang");
var EventEmitter = require("../lib/event_emitter").EventEmitter;
var Gutter = function(parentEl) {
@@ -78,12 +79,15 @@ var Gutter = function(parentEl) {
var annotation = annotations[i];
var row = annotation.row;
var rowInfo = this.$annotations[row];
- if (!rowInfo) {
+ if (!rowInfo)
rowInfo = this.$annotations[row] = {text: []};
- }
- var annoText = annotation.text.replace(/"/g, """).replace(/'/g, "’").replace(/