lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/scss.js in gollum-3.1.2 vs lib/gollum/public/gollum/livepreview/js/ace/lib/ace/mode/scss.js in gollum-3.1.3

- old
+ new

@@ -31,29 +31,33 @@ define(function(require, exports, module) { "use strict"; var oop = require("../lib/oop"); var TextMode = require("./text").Mode; -var Tokenizer = require("../tokenizer").Tokenizer; var ScssHighlightRules = require("./scss_highlight_rules").ScssHighlightRules; var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var CssBehaviour = require("./behaviour/css").CssBehaviour; var CStyleFoldMode = require("./folding/cstyle").FoldMode; var Mode = function() { - this.$tokenizer = new Tokenizer(new ScssHighlightRules().getRules(), "i"); + this.HighlightRules = ScssHighlightRules; this.$outdent = new MatchingBraceOutdent(); + this.$behaviour = new CssBehaviour(); this.foldingRules = new CStyleFoldMode(); }; oop.inherits(Mode, TextMode); (function() { - + + this.lineCommentStart = "//"; + this.blockComment = {start: "/*", end: "*/"}; + this.getNextLineIndent = function(state, line, tab) { var indent = this.$getIndent(line); // ignore braces in comments - var tokens = this.$tokenizer.getLineTokens(line, state).tokens; + var tokens = this.getTokenizer().getLineTokens(line, state).tokens; if (tokens.length && tokens[tokens.length-1].type == "comment") { return indent; } var match = line.match(/^.*\{\s*$/); @@ -70,9 +74,10 @@ this.autoOutdent = function(state, doc, row) { this.$outdent.autoOutdent(doc, row); }; + this.$id = "ace/mode/scss"; }).call(Mode.prototype); exports.Mode = Mode; });