fix ?? highlighting in js mode

This commit is contained in:
Harutyun Amirjanyan 2012-10-04 04:21:56 -04:00
commit 2ef35a2ee9
2 changed files with 2 additions and 8 deletions

View file

@ -32,7 +32,6 @@ define(function(require, exports, module) {
"use strict";
var oop = require("../lib/oop");
var unicode = require("../unicode");
var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
@ -64,7 +63,7 @@ var JavaScriptHighlightRules = function() {
"constant.language":
"null|Infinity|NaN|undefined",
"support.function":
"alert",
"alert"
}, "identifier");
// keywords which can be followed by regular expressions
@ -256,7 +255,7 @@ var JavaScriptHighlightRules = function() {
}, {
// invalid operators
token : "invalid",
regex: /\{\d+,?(?:\d+)?}[+*]|[+*^$?][+*]|\?\?/ // |[^$][?]
regex: /\{\d+,?(?:\d+)?}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/
}, {
// operators
token : "constant.language.escape",

View file

@ -36,14 +36,9 @@ var TextMode = require("./text").Mode;
var Tokenizer = require("../tokenizer").Tokenizer;
var JspHighlightRules = require("./jsp_highlight_rules").JspHighlightRules;
var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
var Range = require("../range").Range;
var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
var CStyleFoldMode = require("./folding/cstyle").FoldMode;
var JavaScriptMode = require("./javascript").Mode;
var CssMode = require("./css").Mode;
var Mode = function() {
var highlighter = new JspHighlightRules();
this.$tokenizer = new Tokenizer(highlighter.getRules());