kopia lustrzana https://github.com/c9/core
update ace
rodzic
916b6255ad
commit
28e2ee832e
|
@ -126,5 +126,5 @@ exports.createEditSession = function(text, mode) {
|
|||
}
|
||||
exports.EditSession = EditSession;
|
||||
exports.UndoManager = UndoManager;
|
||||
exports.version = "1.2.2";
|
||||
exports.version = "1.2.3";
|
||||
});
|
||||
|
|
|
@ -260,12 +260,15 @@ var AcePopup = function(parentNode) {
|
|||
// var maxLines = Math.min(renderer.$maxLines, this.session.getLength());
|
||||
var maxH = renderer.$maxLines * lineHeight * 1.4;
|
||||
var top = pos.top + this.$borderSize;
|
||||
if (top + maxH > screenHeight - lineHeight && !topdownOnly) {
|
||||
var allowTopdown = top > screenHeight / 2 && !topdownOnly;
|
||||
if (allowTopdown && top + lineHeight + maxH > screenHeight) {
|
||||
renderer.$maxPixelHeight = top - 2 * this.$borderSize;
|
||||
el.style.top = "";
|
||||
el.style.bottom = screenHeight - top + "px";
|
||||
popup.isTopdown = false;
|
||||
} else {
|
||||
top += lineHeight;
|
||||
renderer.$maxPixelHeight = screenHeight - top - 0.2 * lineHeight;
|
||||
el.style.top = top + "px";
|
||||
el.style.bottom = "";
|
||||
popup.isTopdown = true;
|
||||
|
|
|
@ -1035,8 +1035,8 @@ var Editor = function(renderer, session) {
|
|||
};
|
||||
|
||||
/**
|
||||
* Pass in `true` to enable overwrites in your session, or `false` to disable. If overwrites is enabled, any text you enter will type over any text after it. If the value of `overwrite` changes, this function also emites the `changeOverwrite` event.
|
||||
* @param {Boolean} overwrite Defines wheter or not to set overwrites
|
||||
* Pass in `true` to enable overwrites in your session, or `false` to disable. If overwrites is enabled, any text you enter will type over any text after it. If the value of `overwrite` changes, this function also emits the `changeOverwrite` event.
|
||||
* @param {Boolean} overwrite Defines whether or not to set overwrites
|
||||
*
|
||||
*
|
||||
* @related EditSession.setOverwrite
|
||||
|
@ -1833,7 +1833,7 @@ var Editor = function(renderer, session) {
|
|||
};
|
||||
|
||||
/**
|
||||
* Returns the number of currently visibile rows.
|
||||
* Returns the number of currently visible rows.
|
||||
* @returns {Number}
|
||||
**/
|
||||
this.$getVisibleRowCount = function() {
|
||||
|
@ -2179,7 +2179,7 @@ var Editor = function(renderer, session) {
|
|||
};
|
||||
|
||||
/**
|
||||
* Moves the cursor to the specified line number, and also into the indiciated column.
|
||||
* Moves the cursor to the specified line number, and also into the indicated column.
|
||||
* @param {Number} lineNumber The line number to go to
|
||||
* @param {Number} column A column number to go to
|
||||
* @param {Boolean} animate If `true` animates scolling
|
||||
|
@ -2334,7 +2334,7 @@ var Editor = function(renderer, session) {
|
|||
};
|
||||
|
||||
/**
|
||||
* Replaces the first occurance of `options.needle` with the value in `replacement`.
|
||||
* Replaces the first occurrence of `options.needle` with the value in `replacement`.
|
||||
* @param {String} replacement The text to replace with
|
||||
* @param {Object} options The [[Search `Search`]] options to use
|
||||
*
|
||||
|
@ -2361,7 +2361,7 @@ var Editor = function(renderer, session) {
|
|||
};
|
||||
|
||||
/**
|
||||
* Replaces all occurances of `options.needle` with the value in `replacement`.
|
||||
* Replaces all occurrences of `options.needle` with the value in `replacement`.
|
||||
* @param {String} replacement The text to replace with
|
||||
* @param {Object} options The [[Search `Search`]] options to use
|
||||
*
|
||||
|
|
|
@ -75,6 +75,7 @@ var supportedModes = {
|
|||
Elm: ["elm"],
|
||||
Erlang: ["erl|hrl"],
|
||||
Forth: ["frt|fs|ldr"],
|
||||
Fortran: ["f|f90"],
|
||||
FTL: ["ftl"],
|
||||
Gcode: ["gcode"],
|
||||
Gherkin: ["feature"],
|
||||
|
@ -135,8 +136,10 @@ var supportedModes = {
|
|||
Protobuf: ["proto"],
|
||||
Python: ["py"],
|
||||
R: ["r"],
|
||||
Razor: ["cshtml"],
|
||||
RDoc: ["Rd"],
|
||||
RHTML: ["Rhtml"],
|
||||
RST: ["rst"],
|
||||
Ruby: ["rb|ru|gemspec|rake|^Guardfile|^Rakefile|^Gemfile"],
|
||||
Rust: ["rs"],
|
||||
SASS: ["sass"],
|
||||
|
@ -201,4 +204,4 @@ module.exports = {
|
|||
modesByName: modesByName
|
||||
};
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
@ -33,7 +33,7 @@ var commandMap = {
|
|||
"commit_completion": false,
|
||||
"context_menu" : false,
|
||||
"decrease_font_size" : "smallerfont",
|
||||
"increase_font_size" : "largerfont",
|
||||
"increase_font_size" : "largerfont"
|
||||
// "copy"
|
||||
// "cut"
|
||||
// "delete_to_mark"
|
||||
|
@ -259,7 +259,7 @@ function SublimeHandler() {
|
|||
keypad_plus: "+",
|
||||
keypad_enter: "numpadEnter",
|
||||
equals: "=",
|
||||
plus: "+",
|
||||
plus: "+"
|
||||
};
|
||||
|
||||
this.setKeyMap = function(keyMap) {
|
||||
|
|
|
@ -79,11 +79,11 @@ var TextInput = function(parentNode, host) {
|
|||
if (tempStyle) return text.focus();
|
||||
var top = text.style.top;
|
||||
text.style.position = "fixed";
|
||||
text.style.top = "-1000px";
|
||||
text.style.top = "0px";
|
||||
text.focus();
|
||||
setTimeout(function() {
|
||||
text.style.position = "";
|
||||
if (text.style.top == "-1000px")
|
||||
if (text.style.top == "0px")
|
||||
text.style.top = top;
|
||||
}, 0);
|
||||
};
|
||||
|
|
|
@ -3,7 +3,7 @@ string.charCodeAt(23); document.getElementById('test'); console.log('Here it is'
|
|||
test: /**tokenize doc*/ comment
|
||||
/**tokenize doc comment with @tag {}*/
|
||||
//test: tokenize parens
|
||||
var line = "[{( )}]";
|
||||
var $line$ = "[{( )}]";
|
||||
//test tokenize arithmetic expression which looks like a regexp
|
||||
a/b/c
|
||||
a/=b/c
|
||||
|
|
|
@ -186,4 +186,28 @@
|
|||
["keyword","END OF"],
|
||||
["text"," I_VBRK"],
|
||||
["keyword.operator","."]
|
||||
],[
|
||||
"start"
|
||||
],[
|
||||
"start",
|
||||
["keyword","SORT"],
|
||||
["text"," i_vbrk "],
|
||||
["keyword","BY"],
|
||||
["text"," vbeln "],
|
||||
["keyword","ASCENDING"],
|
||||
["keyword.operator","."]
|
||||
],[
|
||||
"start",
|
||||
["keyword","SORT"],
|
||||
["text"," i_vbrk "],
|
||||
["keyword","BY"],
|
||||
["text"," vbeln "],
|
||||
["keyword","DESCENDING"],
|
||||
["keyword.operator","."]
|
||||
],[
|
||||
"start"
|
||||
],[
|
||||
"start",
|
||||
["keyword","RETURN"],
|
||||
["keyword.operator","."]
|
||||
]]
|
|
@ -2,21 +2,39 @@
|
|||
"start",
|
||||
["keyword.other.doctype","!!!5"]
|
||||
],[
|
||||
"start"
|
||||
"tag_single"
|
||||
],[
|
||||
"start",
|
||||
["punctuation.section.comment","# <!--[if lt IE 7]> <html class=\"no-js lt-ie9 lt-ie8 lt-ie7\" lang=\"en\"> <![endif]-->"]
|
||||
["text","# "],
|
||||
["comment.xml","<!--[if lt IE 7]> <html class=\"no-js lt-ie9 lt-ie8 lt-ie7\" lang=\"en\"> <![endif]-->"]
|
||||
],[
|
||||
"start",
|
||||
["punctuation.section.comment","# <!--[if IE 7]> <html class=\"no-js lt-ie9 lt-ie8\" lang=\"en\"> <![endif]-->"]
|
||||
["text","# "],
|
||||
["comment.xml","<!--[if IE 7]> <html class=\"no-js lt-ie9 lt-ie8\" lang=\"en\"> <![endif]-->"]
|
||||
],[
|
||||
"start",
|
||||
["punctuation.section.comment","# <!--[if IE 8]> <html class=\"no-js lt-ie9\" lang=\"en\"> <![endif]-->"]
|
||||
["text","# "],
|
||||
["comment.xml","<!--[if IE 8]> <html class=\"no-js lt-ie9\" lang=\"en\"> <![endif]-->"]
|
||||
],[
|
||||
"start",
|
||||
["punctuation.section.comment","# <!--[if gt IE 8]><!--> <html class=\"no-js\" lang=\"en\"> <!--<![endif]-->"]
|
||||
["text","# "],
|
||||
["comment.xml","<!--[if gt IE 8]><!-->"],
|
||||
["text.xml"," "],
|
||||
["meta.tag.punctuation.tag-open.xml","<"],
|
||||
["meta.tag.tag-name.xml","html"],
|
||||
["text.tag-whitespace.xml"," "],
|
||||
["entity.other.attribute-name.xml","class"],
|
||||
["keyword.operator.attribute-equals.xml","="],
|
||||
["string.attribute-value.xml","\"no-js\""],
|
||||
["text.tag-whitespace.xml"," "],
|
||||
["entity.other.attribute-name.xml","lang"],
|
||||
["keyword.operator.attribute-equals.xml","="],
|
||||
["string.attribute-value.xml","\"en\""],
|
||||
["meta.tag.punctuation.tag-close.xml",">"],
|
||||
["text.xml"," "],
|
||||
["comment.xml","<!--<![endif]-->"]
|
||||
],[
|
||||
"start"
|
||||
"tag_single"
|
||||
],[
|
||||
"start"
|
||||
],[
|
||||
|
@ -24,7 +42,7 @@
|
|||
["punctuation.section.comment","/adasdasdad"]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml","%div"],
|
||||
["meta.tag.haml","%div"],
|
||||
["punctuation.section","{"],
|
||||
["constant.other.symbol.ruby",":id"],
|
||||
["text"," => "],
|
||||
|
@ -43,10 +61,10 @@
|
|||
["punctuation.section.comment","/ file: app/views/movies/index.html.haml"]
|
||||
],[
|
||||
"start",
|
||||
["meta.escape.haml","\\d"]
|
||||
["character.escape.haml","\\d"]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml","%ads:"],
|
||||
["meta.tag.haml","%ads:"],
|
||||
["punctuation.section","{"],
|
||||
["constant.other.symbol.ruby",":bleh"],
|
||||
["text"," => "],
|
||||
|
@ -54,121 +72,123 @@
|
|||
["punctuation.section","}"]
|
||||
],[
|
||||
"embedded_ruby",
|
||||
["entity.name.tag.haml","%p"],
|
||||
["text","==ddd=="]
|
||||
["meta.tag.haml","%p"],
|
||||
["text","=="],
|
||||
["text.xml","ddd"],
|
||||
["text","=="]
|
||||
],[
|
||||
"start",
|
||||
["text"," Date/Time:"]
|
||||
["text"," "],
|
||||
["text.xml","Date/Time:"]
|
||||
],[
|
||||
"embedded_ruby",
|
||||
["text"," - "],
|
||||
["identifier","now"],
|
||||
["text"," = "],
|
||||
["text.xml","now "],
|
||||
["text","= "],
|
||||
["support.class","DateTime"],
|
||||
["text","."],
|
||||
["identifier","now"],
|
||||
["text"," "]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml"," %strong"],
|
||||
["text","= now"]
|
||||
],[
|
||||
"embedded_ruby",
|
||||
["text"," = "],
|
||||
["keyword","if"],
|
||||
["text"," "],
|
||||
["identifier","now"],
|
||||
["text"," "],
|
||||
["support.class","DateTime"],
|
||||
["text","."],
|
||||
["identifier","parse"],
|
||||
["text","(\""],
|
||||
["support.class","December"],
|
||||
["text"," "],
|
||||
["constant.numeric","31"],
|
||||
["text",", "],
|
||||
["constant.numeric","2006"],
|
||||
["text","\")"]
|
||||
],[
|
||||
"embedded_ruby",
|
||||
["text"," = \""],
|
||||
["support.class","Happy"],
|
||||
["text"," "],
|
||||
["identifier","new"],
|
||||
["text"," \" + \""],
|
||||
["identifier","year"],
|
||||
["text","!\""]
|
||||
["meta.tag.haml","%strong"],
|
||||
["text","= "],
|
||||
["text.xml","now"]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml","%sfd"],
|
||||
["entity.other.attribute-name.class.haml",".dfdfg"]
|
||||
],[
|
||||
"start",
|
||||
["punctuation.section.comment","#content"]
|
||||
],[
|
||||
"start",
|
||||
["text"," .title"]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml"," %h1"],
|
||||
["text","= @title"]
|
||||
],[
|
||||
"embedded_ruby",
|
||||
["text"," = "],
|
||||
["support.function","link_to"],
|
||||
["text"," '"],
|
||||
["support.class","Home"],
|
||||
["text","', "],
|
||||
["identifier","home_url"]
|
||||
],[
|
||||
"start"
|
||||
["text.xml","if now DateTime.parse("],
|
||||
["string","\"December 31, 2006\""],
|
||||
["text.xml",")"]
|
||||
],[
|
||||
"start",
|
||||
["punctuation.section.comment"," #contents"]
|
||||
["text"," = "],
|
||||
["string","\"Happy new \""],
|
||||
["text.xml"," + "],
|
||||
["string","\"year!\""]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml","%div"],
|
||||
["entity.other.attribute-name.id.haml","#content"]
|
||||
["meta.tag.haml","%sfd"],
|
||||
["keyword.attribute-name.class.haml",".dfdfg"]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml"," %div"],
|
||||
["entity.other.attribute-name.class.haml",".articles"]
|
||||
["keyword.attribute-name.id.haml","#content"]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml"," %div"],
|
||||
["entity.other.attribute-name.class.haml",".article.title"],
|
||||
["text"," Blah"]
|
||||
["text"," "],
|
||||
["keyword.attribute-name.class.haml",".title"]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml"," %div"],
|
||||
["entity.other.attribute-name.class.haml",".article.date"],
|
||||
["text"," "],
|
||||
["meta.tag.haml","%h1"],
|
||||
["text","= "],
|
||||
["text.xml","@title"]
|
||||
],[
|
||||
"start",
|
||||
["text"," = "],
|
||||
["text.xml","link_to "],
|
||||
["string","'Home'"],
|
||||
["text.xml",", home_url"]
|
||||
],[
|
||||
"tag_single"
|
||||
],[
|
||||
"start",
|
||||
["text"," "],
|
||||
["text.xml"," #contents"]
|
||||
],[
|
||||
"start",
|
||||
["meta.tag.haml","%div"],
|
||||
["keyword.attribute-name.id.haml","#content"]
|
||||
],[
|
||||
"start",
|
||||
["text"," "],
|
||||
["meta.tag.haml","%div"],
|
||||
["keyword.attribute-name.class.haml",".articles"]
|
||||
],[
|
||||
"start",
|
||||
["text"," "],
|
||||
["meta.tag.haml","%div"],
|
||||
["keyword.attribute-name.class.haml",".article.title"],
|
||||
["text"," "],
|
||||
["text.xml","Blah"]
|
||||
],[
|
||||
"start",
|
||||
["text"," "],
|
||||
["meta.tag.haml","%div"],
|
||||
["keyword.attribute-name.class.haml",".article.date"],
|
||||
["text"," "],
|
||||
["constant.numeric","2006-11-05"]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml"," %div"],
|
||||
["entity.other.attribute-name.class.haml",".article.entry"]
|
||||
["text"," "],
|
||||
["meta.tag.haml","%div"],
|
||||
["keyword.attribute-name.class.haml",".article.entry"]
|
||||
],[
|
||||
"start",
|
||||
["text"," Neil Patrick Harris "]
|
||||
["text"," "],
|
||||
["text.xml","Neil Patrick Harris "]
|
||||
],[
|
||||
"start"
|
||||
"tag_single"
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml","%div"],
|
||||
["text","[@user, "],
|
||||
["constant.other.symbol.ruby",":greeting"],
|
||||
["text","]"]
|
||||
],[
|
||||
"start",
|
||||
["entity.name.tag.haml"," %bar"],
|
||||
["meta.tag.haml","%div"],
|
||||
["text","["],
|
||||
["constant.numeric","290"],
|
||||
["text","]/"]
|
||||
["text.xml","@user, "],
|
||||
["constant.other.symbol.ruby",":greeting"],
|
||||
["text.xml","]"]
|
||||
],[
|
||||
"start",
|
||||
["text"," "],
|
||||
["string.quoted.double","==Hello!=="]
|
||||
["meta.tag.haml","%bar"],
|
||||
["text","["],
|
||||
["constant.numeric","290"],
|
||||
["text.xml","]/"]
|
||||
],[
|
||||
"embedded_ruby",
|
||||
["text"," =="],
|
||||
["text.xml","Hello!"],
|
||||
["text","=="]
|
||||
],[
|
||||
"start"
|
||||
]]
|
|
@ -48,7 +48,7 @@
|
|||
["text"," "],
|
||||
["storage.type","var"],
|
||||
["text"," "],
|
||||
["identifier","line"],
|
||||
["identifier","$line$"],
|
||||
["text"," "],
|
||||
["keyword.operator","="],
|
||||
["text"," "],
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
],[
|
||||
"start"
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["variable.language",".box-shadow"],
|
||||
["paren.lparen","("],
|
||||
["variable","@style"],
|
||||
|
@ -27,9 +27,10 @@
|
|||
["paren.lparen","("],
|
||||
["variable","@c"],
|
||||
["paren.rparen","))"],
|
||||
["paren.lparen"," {"]
|
||||
["text"," "],
|
||||
["paren.lparen","{"]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["text"," "],
|
||||
["support.type.property","box-shadow"],
|
||||
["text",":"],
|
||||
|
@ -39,7 +40,7 @@
|
|||
["variable","@c"],
|
||||
["text",";"]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["text"," "],
|
||||
["support.type.unknownProperty","-webkit-box-shadow"],
|
||||
["text",":"],
|
||||
|
@ -49,7 +50,7 @@
|
|||
["variable","@c"],
|
||||
["text",";"]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["text"," "],
|
||||
["support.type.unknownProperty","-moz-box-shadow"],
|
||||
["text",":"],
|
||||
|
@ -62,7 +63,7 @@
|
|||
"start",
|
||||
["paren.rparen","}"]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["variable.language",".box-shadow"],
|
||||
["paren.lparen","("],
|
||||
["variable","@style"],
|
||||
|
@ -80,9 +81,10 @@
|
|||
["paren.lparen","("],
|
||||
["variable","@alpha"],
|
||||
["paren.rparen","))"],
|
||||
["paren.lparen"," {"]
|
||||
["text"," "],
|
||||
["paren.lparen","{"]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["text"," "],
|
||||
["variable.language",".box-shadow"],
|
||||
["paren.lparen","("],
|
||||
|
@ -108,12 +110,13 @@
|
|||
"start",
|
||||
["comment","// Box styles"]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["variable.language",".box"],
|
||||
["paren.lparen"," {"],
|
||||
["text"," "],
|
||||
["paren.lparen","{"],
|
||||
["text"," "]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["text"," "],
|
||||
["support.type.property","color"],
|
||||
["text",":"],
|
||||
|
@ -127,7 +130,7 @@
|
|||
["paren.rparen",")"],
|
||||
["text",";"]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["text"," "],
|
||||
["support.type.property","border-color"],
|
||||
["text",":"],
|
||||
|
@ -141,13 +144,14 @@
|
|||
["paren.rparen",")"],
|
||||
["text",";"]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["text"," "]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["text"," "],
|
||||
["identifier","div"],
|
||||
["paren.lparen"," {"],
|
||||
["text"," "],
|
||||
["paren.lparen","{"],
|
||||
["text"," "],
|
||||
["variable.language",".box-shadow"],
|
||||
["paren.lparen","("],
|
||||
|
@ -164,15 +168,16 @@
|
|||
["text"," "],
|
||||
["paren.rparen","}"]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["text"," "]
|
||||
],[
|
||||
["ruleset","ruleset"],
|
||||
"start",
|
||||
["text"," "],
|
||||
["identifier","a"],
|
||||
["paren.lparen"," {"]
|
||||
["text"," "],
|
||||
["paren.lparen","{"]
|
||||
],[
|
||||
["ruleset","ruleset"],
|
||||
"start",
|
||||
["text"," "],
|
||||
["support.type.property","color"],
|
||||
["text",":"],
|
||||
|
@ -180,16 +185,17 @@
|
|||
["variable","@base"],
|
||||
["text",";"]
|
||||
],[
|
||||
["ruleset","ruleset"],
|
||||
"start",
|
||||
["text"," "]
|
||||
],[
|
||||
["ruleset","ruleset","ruleset","ruleset"],
|
||||
"start",
|
||||
["text"," "],
|
||||
["keyword","&"],
|
||||
["variable.language",":hover"],
|
||||
["paren.lparen"," {"]
|
||||
["text"," "],
|
||||
["paren.lparen","{"]
|
||||
],[
|
||||
["ruleset","ruleset","ruleset","ruleset"],
|
||||
"start",
|
||||
["text"," "],
|
||||
["support.type.property","color"],
|
||||
["text",":"],
|
||||
|
@ -203,11 +209,11 @@
|
|||
["paren.rparen",")"],
|
||||
["text",";"]
|
||||
],[
|
||||
["ruleset","ruleset"],
|
||||
"start",
|
||||
["text"," "],
|
||||
["paren.rparen","}"]
|
||||
],[
|
||||
"ruleset",
|
||||
"start",
|
||||
["text"," "],
|
||||
["paren.rparen","}"]
|
||||
],[
|
||||
|
|
|
@ -315,7 +315,7 @@
|
|||
["paren.lparen","("],
|
||||
["constant.library","table"],
|
||||
["text","."],
|
||||
["invalid.deprecated","maxn"],
|
||||
["keyword.deprecated","maxn"],
|
||||
["paren.lparen","{"],
|
||||
["constant.numeric","1"],
|
||||
["text",","],
|
||||
|
|
|
@ -262,7 +262,7 @@
|
|||
["text"," "],
|
||||
["keyword.operator","="],
|
||||
["text"," "],
|
||||
["paren","{"]
|
||||
["paren.lparen","{"]
|
||||
],[
|
||||
["#tmp","js-statement-no_regex","start","js-statement-no_regex","constant.language53","start","paren.lparen13","constant.language","constant.language","start","paren.lparen39","constant.language27","constant.language27","start","paren.lparen52","constant.language40"],
|
||||
["text"," "],
|
||||
|
|
|
@ -325,19 +325,19 @@
|
|||
"start",
|
||||
["text"," "],
|
||||
["storage.type.objc","IBOutlet"],
|
||||
["text","|"],
|
||||
["keyword.operator","|"],
|
||||
["storage.type.objc","IBAction"],
|
||||
["text","|"],
|
||||
["keyword.operator","|"],
|
||||
["storage.type.objc","BOOL"],
|
||||
["text","|"],
|
||||
["keyword.operator","|"],
|
||||
["storage.type.objc","SEL"],
|
||||
["text","|"],
|
||||
["keyword.operator","|"],
|
||||
["storage.type.id.objc","id"],
|
||||
["text","|"],
|
||||
["keyword.operator","|"],
|
||||
["storage.type.objc","unichar"],
|
||||
["text","|"],
|
||||
["keyword.operator","|"],
|
||||
["storage.type.objc","IMP"],
|
||||
["text","|"],
|
||||
["keyword.operator","|"],
|
||||
["storage.type.objc","Class"],
|
||||
["text"," "]
|
||||
],[
|
||||
|
|
|
@ -1,13 +1,16 @@
|
|||
[[
|
||||
"start",
|
||||
["text","myfilename "],
|
||||
["identifier","myfilename"],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","="],
|
||||
["text"," "],
|
||||
["punctuation.definition.string.begin.asp","\""],
|
||||
["string.quoted.double.asp","C:\\Wikipedia - VBScript - Example - Hello World.txt\""]
|
||||
],[
|
||||
"start",
|
||||
["text","MakeHelloWorldFile myfilename"]
|
||||
["identifier","MakeHelloWorldFile"],
|
||||
["text"," "],
|
||||
["identifier","myfilename"]
|
||||
],[
|
||||
"state_4",
|
||||
["meta.leading-space"," "]
|
||||
|
@ -29,10 +32,12 @@
|
|||
["meta.odd-tab.spaces"," "],
|
||||
["meta.leading-space"," "],
|
||||
["storage.type.asp","Set"],
|
||||
["text"," FSO "],
|
||||
["text"," "],
|
||||
["identifier","FSO"],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","="],
|
||||
["text"," "],
|
||||
["support.function.asp","CreateObject"],
|
||||
["support.function.vb.asp","CreateObject"],
|
||||
["text","("],
|
||||
["punctuation.definition.string.begin.asp","\""],
|
||||
["string.quoted.double.asp","Scripting.FileSystemObject\""],
|
||||
|
@ -42,9 +47,13 @@
|
|||
["meta.odd-tab.spaces"," "],
|
||||
["meta.leading-space"," "],
|
||||
["keyword.control.asp","If"],
|
||||
["text"," FSO."],
|
||||
["entity.name.function.asp","FileExists"],
|
||||
["text","(FileName) "],
|
||||
["text"," "],
|
||||
["identifier","FSO"],
|
||||
["text","."],
|
||||
["identifier","FileExists"],
|
||||
["text","("],
|
||||
["identifier","FileName"],
|
||||
["text",") "],
|
||||
["keyword.control.asp","Then"],
|
||||
["text"," "]
|
||||
],[
|
||||
|
@ -52,7 +61,8 @@
|
|||
["meta.odd-tab.spaces"," "],
|
||||
["meta.even-tab.spaces"," "],
|
||||
["meta.odd-tab.spaces"," "],
|
||||
["text","Answer "],
|
||||
["identifier","Answer"],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","="],
|
||||
["text"," "],
|
||||
["support.function.vb.asp","MsgBox"],
|
||||
|
@ -61,12 +71,16 @@
|
|||
["string.quoted.double.asp","File \""],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","&"],
|
||||
["text"," FileName "],
|
||||
["text"," "],
|
||||
["identifier","FileName"],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","&"],
|
||||
["text"," "],
|
||||
["punctuation.definition.string.begin.asp","\""],
|
||||
["string.quoted.double.asp"," exists ... OK to overwrite?\""],
|
||||
["text",", vbOKCancel)"]
|
||||
["text",", "],
|
||||
["identifier","vbOKCancel"],
|
||||
["text",")"]
|
||||
],[
|
||||
"start",
|
||||
["meta.odd-tab.spaces"," "],
|
||||
|
@ -87,12 +101,18 @@
|
|||
["meta.even-tab.spaces"," "],
|
||||
["meta.odd-tab.spaces"," "],
|
||||
["keyword.control.asp","If"],
|
||||
["text"," Answer "],
|
||||
["text"," "],
|
||||
["identifier","Answer"],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","<>"],
|
||||
["text"," vbOK "],
|
||||
["text"," "],
|
||||
["identifier","vbOK"],
|
||||
["text"," "],
|
||||
["keyword.control.asp","Then"],
|
||||
["text"," "],
|
||||
["keyword.control.asp","Exit Sub"]
|
||||
["keyword.control.asp","Exit"],
|
||||
["text"," "],
|
||||
["keyword.control.asp","Sub"]
|
||||
],[
|
||||
"start",
|
||||
["meta.odd-tab.spaces"," "],
|
||||
|
@ -110,7 +130,8 @@
|
|||
["meta.odd-tab.spaces"," "],
|
||||
["meta.even-tab.spaces"," "],
|
||||
["meta.odd-tab.spaces"," "],
|
||||
["text","Answer "],
|
||||
["identifier","Answer"],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","="],
|
||||
["text"," "],
|
||||
["support.function.vb.asp","MsgBox"],
|
||||
|
@ -119,29 +140,41 @@
|
|||
["string.quoted.double.asp","File \""],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","&"],
|
||||
["text"," FileName "],
|
||||
["text"," "],
|
||||
["identifier","FileName"],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","&"],
|
||||
["text"," "],
|
||||
["punctuation.definition.string.begin.asp","\""],
|
||||
["string.quoted.double.asp"," ... OK to create?\""],
|
||||
["text",", vbOKCancel)"]
|
||||
["text",", "],
|
||||
["identifier","vbOKCancel"],
|
||||
["text",")"]
|
||||
],[
|
||||
"start",
|
||||
["meta.odd-tab.spaces"," "],
|
||||
["meta.even-tab.spaces"," "],
|
||||
["meta.odd-tab.spaces"," "],
|
||||
["keyword.control.asp","If"],
|
||||
["text"," Answer "],
|
||||
["text"," "],
|
||||
["identifier","Answer"],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","<>"],
|
||||
["text"," vbOK "],
|
||||
["text"," "],
|
||||
["identifier","vbOK"],
|
||||
["text"," "],
|
||||
["keyword.control.asp","Then"],
|
||||
["text"," "],
|
||||
["keyword.control.asp","Exit Sub"]
|
||||
["keyword.control.asp","Exit"],
|
||||
["text"," "],
|
||||
["keyword.control.asp","Sub"]
|
||||
],[
|
||||
"start",
|
||||
["meta.odd-tab.spaces"," "],
|
||||
["meta.leading-space"," "],
|
||||
["keyword.control.asp","End If"]
|
||||
["keyword.control.asp","End"],
|
||||
["text"," "],
|
||||
["keyword.control.asp","If"]
|
||||
],[
|
||||
"start",
|
||||
["meta.odd-tab.spaces"," "],
|
||||
|
@ -153,14 +186,25 @@
|
|||
["meta.odd-tab.spaces"," "],
|
||||
["meta.leading-space"," "],
|
||||
["storage.type.asp","Set"],
|
||||
["text"," FileObject "],
|
||||
["text"," "],
|
||||
["identifier","FileObject"],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","="],
|
||||
["text"," FSO.CreateTextFile (FileName)"]
|
||||
["text"," "],
|
||||
["identifier","FSO"],
|
||||
["text","."],
|
||||
["identifier","CreateTextFile"],
|
||||
["text"," ("],
|
||||
["identifier","FileName"],
|
||||
["text",")"]
|
||||
],[
|
||||
"start",
|
||||
["meta.odd-tab.spaces"," "],
|
||||
["meta.leading-space"," "],
|
||||
["text","FileObject.WriteLine "],
|
||||
["identifier","FileObject"],
|
||||
["text","."],
|
||||
["identifier","WriteLine"],
|
||||
["text"," "],
|
||||
["punctuation.definition.string.begin.asp","\""],
|
||||
["string.quoted.double.asp","Time ... \""],
|
||||
["text"," "],
|
||||
|
@ -172,15 +216,19 @@
|
|||
"start",
|
||||
["meta.odd-tab.spaces"," "],
|
||||
["meta.leading-space"," "],
|
||||
["text","FileObject.WriteLine "],
|
||||
["identifier","FileObject"],
|
||||
["text","."],
|
||||
["identifier","WriteLine"],
|
||||
["text"," "],
|
||||
["punctuation.definition.string.begin.asp","\""],
|
||||
["string.quoted.double.asp","Hello World\""]
|
||||
],[
|
||||
"start",
|
||||
["meta.odd-tab.spaces"," "],
|
||||
["meta.leading-space"," "],
|
||||
["text","FileObject."],
|
||||
["entity.name.function.asp","Close"],
|
||||
["identifier","FileObject"],
|
||||
["text","."],
|
||||
["identifier","Close"],
|
||||
["text","()"]
|
||||
],[
|
||||
"start",
|
||||
|
@ -192,12 +240,16 @@
|
|||
["string.quoted.double.asp","File \""],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","&"],
|
||||
["text"," FileName "],
|
||||
["text"," "],
|
||||
["identifier","FileName"],
|
||||
["text"," "],
|
||||
["keyword.operator.asp","&"],
|
||||
["text"," "],
|
||||
["punctuation.definition.string.begin.asp","\""],
|
||||
["string.quoted.double.asp"," ... updated.\""]
|
||||
],[
|
||||
"start",
|
||||
["storage.type.asp","End Sub"]
|
||||
["keyword.control.asp","End"],
|
||||
["text"," "],
|
||||
["keyword.control.asp","Sub"]
|
||||
]]
|
|
@ -48,9 +48,9 @@ var AbapHighlightRules = function() {
|
|||
var keywordMapper = this.createKeywordMapper({
|
||||
"variable.language": "this",
|
||||
"keyword":
|
||||
"ADD ALIAS ALIASES ASSERT ASSIGN ASSIGNING AT BACK" +
|
||||
"ADD ALIAS ALIASES ASCENDING ASSERT ASSIGN ASSIGNING AT BACK" +
|
||||
" CALL CASE CATCH CHECK CLASS CLEAR CLOSE CNT COLLECT COMMIT COMMUNICATION COMPUTE CONCATENATE CONDENSE CONSTANTS CONTINUE CONTROLS CONVERT CREATE CURRENCY" +
|
||||
" DATA DEFINE DEFINITION DEFERRED DELETE DESCRIBE DETAIL DIVIDE DO" +
|
||||
" DATA DEFINE DEFINITION DEFERRED DELETE DESCENDING DESCRIBE DETAIL DIVIDE DO" +
|
||||
" ELSE ELSEIF ENDAT ENDCASE ENDCLASS ENDDO ENDEXEC ENDFORM ENDFUNCTION ENDIF ENDIFEND ENDINTERFACE ENDLOOP ENDMETHOD ENDMODULE ENDON ENDPROVIDE ENDSELECT ENDTRY ENDWHILE EVENT EVENTS EXEC EXIT EXPORT EXPORTING EXTRACT" +
|
||||
" FETCH FIELDS FORM FORMAT FREE FROM FUNCTION" +
|
||||
" GENERATE GET" +
|
||||
|
@ -60,7 +60,7 @@ var AbapHighlightRules = function() {
|
|||
" MESSAGE METHOD METHODS MODIFY MODULE MOVE MULTIPLY" +
|
||||
" ON OVERLAY OPTIONAL OTHERS" +
|
||||
" PACK PARAMETERS PERFORM POSITION PROGRAM PROVIDE PUT" +
|
||||
" RAISE RANGES READ RECEIVE RECEIVING REDEFINITION REFERENCE REFRESH REJECT REPLACE REPORT RESERVE RESTORE RETURNING ROLLBACK" +
|
||||
" RAISE RANGES READ RECEIVE RECEIVING REDEFINITION REFERENCE REFRESH REJECT REPLACE REPORT RESERVE RESTORE RETURN RETURNING ROLLBACK" +
|
||||
" SCAN SCROLL SEARCH SELECT SET SHIFT SKIP SORT SORTED SPLIT STANDARD STATICS STEP STOP SUBMIT SUBTRACT SUM SUMMARY SUPPRESS" +
|
||||
" TABLES TIMES TRANSFER TRANSLATE TRY TYPE TYPES" +
|
||||
" UNASSIGN ULINE UNPACK UPDATE" +
|
||||
|
|
|
@ -49,20 +49,26 @@ var C9SearchHighlightRules = function() {
|
|||
"start" : [
|
||||
{
|
||||
tokenNames : ["c9searchresults.constant.numeric", "c9searchresults.text", "c9searchresults.text", "c9searchresults.keyword"],
|
||||
regex : "(^\\s+[0-9]+)(:\\s)(.+)",
|
||||
regex : /(^\s+[0-9]+)(:)(\d*\s?)([^\r\n]+)/,
|
||||
onMatch : function(val, state, stack) {
|
||||
var values = this.splitRegex.exec(val);
|
||||
var types = this.tokenNames;
|
||||
var tokens = [{
|
||||
type: types[0],
|
||||
value: values[1]
|
||||
},{
|
||||
}, {
|
||||
type: types[1],
|
||||
value: values[2]
|
||||
}];
|
||||
|
||||
if (values[3]) {
|
||||
if (values[3] == " ")
|
||||
tokens[1] = { type: types[1], value: values[2] + " " };
|
||||
else
|
||||
tokens.push({ type: types[1], value: values[3] });
|
||||
}
|
||||
var regex = stack[1];
|
||||
var str = values[3];
|
||||
var str = values[4];
|
||||
|
||||
var m;
|
||||
var last = 0;
|
||||
|
@ -85,11 +91,7 @@ var C9SearchHighlightRules = function() {
|
|||
}
|
||||
},
|
||||
{
|
||||
token : ["string", "text"], // single line
|
||||
regex : "(\\S.*)(:$)"
|
||||
},
|
||||
{
|
||||
regex : "Searching for .*$",
|
||||
regex : "^Searching for [^\\r\\n]*$",
|
||||
onMatch: function(val, state, stack) {
|
||||
var parts = val.split("\x01");
|
||||
if (parts.length < 3)
|
||||
|
@ -168,11 +170,26 @@ var C9SearchHighlightRules = function() {
|
|||
}
|
||||
},
|
||||
{
|
||||
regex : "\\d+",
|
||||
token: "constant.numeric"
|
||||
regex : "^(?=Found \\d+ matches)",
|
||||
token : "text",
|
||||
next : "numbers"
|
||||
},
|
||||
{
|
||||
token : "string", // single line
|
||||
regex : "^\\S:?[^:]+",
|
||||
next : "numbers"
|
||||
}
|
||||
]
|
||||
],
|
||||
numbers:[{
|
||||
regex : "\\d+",
|
||||
token : "constant.numeric"
|
||||
}, {
|
||||
regex : "$",
|
||||
token : "text",
|
||||
next : "start"
|
||||
}]
|
||||
};
|
||||
this.normalizeRules();
|
||||
};
|
||||
|
||||
oop.inherits(C9SearchHighlightRules, TextHighlightRules);
|
||||
|
|
|
@ -107,10 +107,10 @@ var c_cppHighlightRules = function() {
|
|||
regex : cFunctions
|
||||
}, {
|
||||
token : keywordMapper,
|
||||
regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
|
||||
regex : "[a-zA-Z_$][a-zA-Z0-9_$]*"
|
||||
}, {
|
||||
token : "keyword.operator",
|
||||
regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"
|
||||
regex : /--|\+\+|<<=|>>=|>>>=|<>|&&|\|\||\?:|[*%\/+\-&\^|~!<>=]=?/
|
||||
}, {
|
||||
token : "punctuation.operator",
|
||||
regex : "\\?|\\:|\\,|\\;|\\."
|
||||
|
|
|
@ -2812,7 +2812,7 @@ Parser.prototype = function(){
|
|||
|
||||
var tokenStream = this._tokenStream,
|
||||
values = [],
|
||||
//valueParts = [],
|
||||
//valueParts = [],
|
||||
value = null,
|
||||
operator = null;
|
||||
|
||||
|
@ -2829,9 +2829,9 @@ Parser.prototype = function(){
|
|||
values.push(operator);
|
||||
} /*else {
|
||||
//if there's not an operator, you have a full value
|
||||
values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col));
|
||||
valueParts = [];
|
||||
}*/
|
||||
values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col));
|
||||
valueParts = [];
|
||||
}*/
|
||||
|
||||
value = this._term(inFunction);
|
||||
|
||||
|
@ -2843,7 +2843,7 @@ Parser.prototype = function(){
|
|||
} while(true);
|
||||
}
|
||||
|
||||
//cleanup
|
||||
//cleanup
|
||||
/*if (valueParts.length){
|
||||
values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col));
|
||||
}*/
|
||||
|
@ -3558,7 +3558,7 @@ var Properties = {
|
|||
"alignment-baseline" : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
|
||||
"animation" : 1,
|
||||
"animation-delay" : { multi: "<time>", comma: true },
|
||||
"animation-direction" : { multi: "normal | alternate", comma: true },
|
||||
"animation-direction" : { multi: "normal | reverse | alternate | alternate-reverse", comma: true },
|
||||
"animation-duration" : { multi: "<time>", comma: true },
|
||||
"animation-fill-mode" : { multi: "none | forwards | backwards | both", comma: true },
|
||||
"animation-iteration-count" : { multi: "<number> | infinite", comma: true },
|
||||
|
@ -3568,21 +3568,21 @@ var Properties = {
|
|||
|
||||
//vendor prefixed
|
||||
"-moz-animation-delay" : { multi: "<time>", comma: true },
|
||||
"-moz-animation-direction" : { multi: "normal | alternate", comma: true },
|
||||
"-moz-animation-direction" : { multi: "normal | reverse | alternate | alternate-reverse", comma: true },
|
||||
"-moz-animation-duration" : { multi: "<time>", comma: true },
|
||||
"-moz-animation-iteration-count" : { multi: "<number> | infinite", comma: true },
|
||||
"-moz-animation-name" : { multi: "none | <ident>", comma: true },
|
||||
"-moz-animation-play-state" : { multi: "running | paused", comma: true },
|
||||
|
||||
"-ms-animation-delay" : { multi: "<time>", comma: true },
|
||||
"-ms-animation-direction" : { multi: "normal | alternate", comma: true },
|
||||
"-ms-animation-direction" : { multi: "normal | reverse | alternate | alternate-reverse", comma: true },
|
||||
"-ms-animation-duration" : { multi: "<time>", comma: true },
|
||||
"-ms-animation-iteration-count" : { multi: "<number> | infinite", comma: true },
|
||||
"-ms-animation-name" : { multi: "none | <ident>", comma: true },
|
||||
"-ms-animation-play-state" : { multi: "running | paused", comma: true },
|
||||
|
||||
"-webkit-animation-delay" : { multi: "<time>", comma: true },
|
||||
"-webkit-animation-direction" : { multi: "normal | alternate", comma: true },
|
||||
"-webkit-animation-direction" : { multi: "normal | reverse | alternate | alternate-reverse", comma: true },
|
||||
"-webkit-animation-duration" : { multi: "<time>", comma: true },
|
||||
"-webkit-animation-fill-mode" : { multi: "none | forwards | backwards | both", comma: true },
|
||||
"-webkit-animation-iteration-count" : { multi: "<number> | infinite", comma: true },
|
||||
|
@ -3590,7 +3590,7 @@ var Properties = {
|
|||
"-webkit-animation-play-state" : { multi: "running | paused", comma: true },
|
||||
|
||||
"-o-animation-delay" : { multi: "<time>", comma: true },
|
||||
"-o-animation-direction" : { multi: "normal | alternate", comma: true },
|
||||
"-o-animation-direction" : { multi: "normal | reverse | alternate | alternate-reverse", comma: true },
|
||||
"-o-animation-duration" : { multi: "<time>", comma: true },
|
||||
"-o-animation-iteration-count" : { multi: "<number> | infinite", comma: true },
|
||||
"-o-animation-name" : { multi: "none | <ident>", comma: true },
|
||||
|
@ -4719,12 +4719,12 @@ function isIdentStart(c){
|
|||
}
|
||||
|
||||
function mix(receiver, supplier){
|
||||
for (var prop in supplier){
|
||||
if (supplier.hasOwnProperty(prop)){
|
||||
receiver[prop] = supplier[prop];
|
||||
}
|
||||
}
|
||||
return receiver;
|
||||
for (var prop in supplier){
|
||||
if (supplier.hasOwnProperty(prop)){
|
||||
receiver[prop] = supplier[prop];
|
||||
}
|
||||
}
|
||||
return receiver;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@ -4740,7 +4740,7 @@ function mix(receiver, supplier){
|
|||
* @namespace parserlib.css
|
||||
*/
|
||||
function TokenStream(input){
|
||||
TokenStreamBase.call(this, input, Tokens);
|
||||
TokenStreamBase.call(this, input, Tokens);
|
||||
}
|
||||
|
||||
TokenStream.prototype = mix(new TokenStreamBase(), {
|
||||
|
@ -9625,4 +9625,4 @@ CSSLint.addFormatter({
|
|||
|
||||
module.exports.CSSLint = CSSLint;
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
@ -52,7 +52,7 @@ var Mode = function() {
|
|||
oop.inherits(Mode, TextMode);
|
||||
|
||||
(function() {
|
||||
this.lineCommentStart = ["//", "#"];
|
||||
this.lineCommentStart = "//";
|
||||
|
||||
this.$id = "ace/mode/haml";
|
||||
}).call(Mode.prototype);
|
||||
|
|
|
@ -2,7 +2,7 @@ define(function(require, exports, module) {
|
|||
"use strict";
|
||||
|
||||
var oop = require("../lib/oop");
|
||||
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
||||
var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
|
||||
var RubyExports = require("./ruby_highlight_rules");
|
||||
var RubyHighlightRules = RubyExports.RubyHighlightRules;
|
||||
|
||||
|
@ -10,18 +10,12 @@ var HamlHighlightRules = function() {
|
|||
|
||||
// regexp must not have capturing parentheses. Use (?:) instead.
|
||||
// regexps are ordered -> the first match is used
|
||||
|
||||
this.$rules =
|
||||
{
|
||||
"start": [
|
||||
HtmlHighlightRules.call(this);
|
||||
this.$rules.start.unshift(
|
||||
{
|
||||
token : "punctuation.section.comment",
|
||||
regex : /^\s*\/.*/
|
||||
},
|
||||
{
|
||||
token : "punctuation.section.comment",
|
||||
regex : /^\s*#.*/
|
||||
},
|
||||
{
|
||||
token: "string.quoted.double",
|
||||
regex: "==.+?=="
|
||||
|
@ -34,13 +28,13 @@ var HamlHighlightRules = function() {
|
|||
RubyExports.qqString,
|
||||
RubyExports.tString,
|
||||
{
|
||||
token: ["entity.name.tag.haml"],
|
||||
regex: /^\s*%[\w:]+/,
|
||||
next: "tag_single"
|
||||
token: "character.escape.haml",
|
||||
regex: "^\\s*\\\\."
|
||||
},
|
||||
{
|
||||
token: [ "meta.escape.haml" ],
|
||||
regex: "^\\s*\\\\."
|
||||
token: "text",
|
||||
regex: /^\s*/,
|
||||
next: "tag_single"
|
||||
},
|
||||
RubyExports.constantNumericHex,
|
||||
RubyExports.constantNumericFloat,
|
||||
|
@ -51,14 +45,18 @@ var HamlHighlightRules = function() {
|
|||
regex: "=|-|~",
|
||||
next: "embedded_ruby"
|
||||
}
|
||||
],
|
||||
"tag_single": [
|
||||
);
|
||||
this.$rules.tag_single = [
|
||||
{
|
||||
token: "entity.other.attribute-name.class.haml",
|
||||
token: "meta.tag.haml",
|
||||
regex: /(%[\w:\-]+)/
|
||||
},
|
||||
{
|
||||
token: "keyword.attribute-name.class.haml",
|
||||
regex: "\\.[\\w-]+"
|
||||
},
|
||||
{
|
||||
token: "entity.other.attribute-name.id.haml",
|
||||
token: "keyword.attribute-name.id.haml",
|
||||
regex: "#[\\w-]+"
|
||||
},
|
||||
{
|
||||
|
@ -79,8 +77,8 @@ var HamlHighlightRules = function() {
|
|||
regex: "$|(?!\\.|#|\\{|\\[|=|-|~|\\/)",
|
||||
next: "start"
|
||||
}
|
||||
],
|
||||
"section": [
|
||||
];
|
||||
this.$rules.section = [
|
||||
RubyExports.constantOtherSymbol,
|
||||
|
||||
RubyExports.qString,
|
||||
|
@ -94,8 +92,9 @@ var HamlHighlightRules = function() {
|
|||
regex: "\\}",
|
||||
next: "start"
|
||||
}
|
||||
],
|
||||
"embedded_ruby": [
|
||||
];
|
||||
|
||||
this.$rules.embedded_ruby = [
|
||||
RubyExports.constantNumericHex,
|
||||
RubyExports.constantNumericFloat,
|
||||
{
|
||||
|
@ -121,12 +120,12 @@ var HamlHighlightRules = function() {
|
|||
regex : "^(?!.*\\|\\s*$)",
|
||||
next : "start"
|
||||
}
|
||||
]
|
||||
}
|
||||
];
|
||||
|
||||
this.normalizeRules();
|
||||
};
|
||||
|
||||
oop.inherits(HamlHighlightRules, TextHighlightRules);
|
||||
oop.inherits(HamlHighlightRules, HtmlHighlightRules);
|
||||
|
||||
exports.HamlHighlightRules = HamlHighlightRules;
|
||||
});
|
||||
|
|
|
@ -36,7 +36,7 @@ var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocComme
|
|||
var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
||||
|
||||
// TODO: Unicode escape sequences
|
||||
var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*\\b";
|
||||
var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*";
|
||||
|
||||
var JavaScriptHighlightRules = function(options) {
|
||||
// see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
|
||||
|
@ -53,7 +53,7 @@ var JavaScriptHighlightRules = function(options) {
|
|||
"JSON|Math|" + // Other
|
||||
"this|arguments|prototype|window|document" , // Pseudo
|
||||
"keyword":
|
||||
"const|yield|import|get|set|" +
|
||||
"const|yield|import|get|set|async|await|" +
|
||||
"break|case|catch|continue|default|delete|do|else|finally|for|function|" +
|
||||
"if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|" +
|
||||
// invalid or reserved
|
||||
|
@ -486,7 +486,9 @@ function JSX() {
|
|||
{include : "reference"},
|
||||
{defaultToken : "string.attribute-value.xml"}
|
||||
]
|
||||
}];
|
||||
},
|
||||
jsxTag
|
||||
];
|
||||
this.$rules.reference = [{
|
||||
token : "constant.language.escape.reference.xml",
|
||||
regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
|
||||
|
|
|
@ -71,10 +71,6 @@ var LessHighlightRules = function() {
|
|||
token : "comment", // multi line comment
|
||||
regex : "\\/\\*",
|
||||
next : "comment"
|
||||
}, {
|
||||
token: "paren.lparen",
|
||||
regex: "[^@]\\{",
|
||||
push: "ruleset"
|
||||
}, {
|
||||
token : "string", // single line
|
||||
regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
|
||||
|
@ -143,10 +139,10 @@ var LessHighlightRules = function() {
|
|||
regex : "<|>|<=|>=|=|!=|-|%|\\+|\\*"
|
||||
}, {
|
||||
token : "paren.lparen",
|
||||
regex : "[[(]"
|
||||
regex : "[[({]"
|
||||
}, {
|
||||
token : "paren.rparen",
|
||||
regex : "[\\])]"
|
||||
regex : "[\\])}]"
|
||||
}, {
|
||||
token : "text",
|
||||
regex : "\\s+"
|
||||
|
@ -163,18 +159,8 @@ var LessHighlightRules = function() {
|
|||
token : "comment", // comment spanning whole line
|
||||
regex : ".+"
|
||||
}
|
||||
],
|
||||
"ruleset" : [
|
||||
{
|
||||
token : "paren.rparen",
|
||||
regex : "\\}",
|
||||
next: "pop"
|
||||
}
|
||||
]
|
||||
};
|
||||
|
||||
this.$rules.ruleset = this.$rules.ruleset.concat(this.$rules.start);
|
||||
|
||||
this.normalizeRules();
|
||||
};
|
||||
|
||||
|
|
|
@ -72,17 +72,14 @@ var LuaHighlightRules = function() {
|
|||
|
||||
var stdLibaries = ("string|package|os|io|math|debug|table|coroutine");
|
||||
|
||||
var futureReserved = "";
|
||||
|
||||
var deprecatedIn5152 = ("setn|foreach|foreachi|gcinfo|log10|maxn");
|
||||
|
||||
var keywordMapper = this.createKeywordMapper({
|
||||
"keyword": keywords,
|
||||
"support.function": functions,
|
||||
"invalid.deprecated": deprecatedIn5152,
|
||||
"keyword.deprecated": deprecatedIn5152,
|
||||
"constant.library": stdLibaries,
|
||||
"constant.language": builtinConstants,
|
||||
"invalid.illegal": futureReserved,
|
||||
"variable.language": "self"
|
||||
}, "identifier");
|
||||
|
||||
|
|
|
@ -6,64 +6,181 @@ var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
|||
|
||||
var PowershellHighlightRules = function() {
|
||||
|
||||
// Help Reference: about_Language_Keywords
|
||||
// https://technet.microsoft.com/en-us/library/hh847744.aspx
|
||||
var keywords = (
|
||||
"function|if|else|elseif|switch|while|default|for|do|until|break|continue|" +
|
||||
"foreach|return|filter|in|trap|throw|param|begin|process|end"
|
||||
"begin|break|catch|continue|data|do|dynamicparam|else|elseif|end|exit|filter|" +
|
||||
"finally|for|foreach|from|function|if|in|inlinescript|hidden|parallel|param|" +
|
||||
"process|return|sequence|switch|throw|trap|try|until|while|workflow"
|
||||
);
|
||||
|
||||
// Command to enumerate all module commands in Windows PowerShell:
|
||||
// PS C:\> Get-Module -ListAvailable | Select-Object -Unique Name -ExpandProperty Name | Sort-Object |
|
||||
// ForEach-Object { "// Module $_"; '"' + ((Get-Command -Module $_ | Select-Object -ExpandProperty Name) -join '|') + '|" +' } | clip
|
||||
var builtinFunctions = (
|
||||
"Get-Alias|Import-Alias|New-Alias|Set-Alias|Get-AuthenticodeSignature|Set-AuthenticodeSignature|" +
|
||||
"Set-Location|Get-ChildItem|Clear-Item|Get-Command|Measure-Command|Trace-Command|" +
|
||||
"Add-Computer|Checkpoint-Computer|Remove-Computer|Restart-Computer|Restore-Computer|Stop-Computer|" +
|
||||
"Reset-ComputerMachinePassword|Test-ComputerSecureChannel|Add-Content|Get-Content|Set-Content|Clear-Content|" +
|
||||
"Get-Command|Invoke-Command|Enable-ComputerRestore|Disable-ComputerRestore|Get-ComputerRestorePoint|Test-Connection|" +
|
||||
"ConvertFrom-CSV|ConvertTo-CSV|ConvertTo-Html|ConvertTo-Xml|ConvertFrom-SecureString|ConvertTo-SecureString|" +
|
||||
"Copy-Item|Export-Counter|Get-Counter|Import-Counter|Get-Credential|Get-Culture|" +
|
||||
"Get-ChildItem|Get-Date|Set-Date|Remove-Item|Compare-Object|Get-Event|" +
|
||||
"Get-WinEvent|New-Event|Remove-Event|Unregister-Event|Wait-Event|Clear-EventLog|" +
|
||||
"Get-Eventlog|Limit-EventLog|New-Eventlog|Remove-EventLog|Show-EventLog|Write-EventLog|" +
|
||||
"Get-EventSubscriber|Register-EngineEvent|Register-ObjectEvent|Register-WmiEvent|Get-ExecutionPolicy|Set-ExecutionPolicy|" +
|
||||
"Export-Alias|Export-Clixml|Export-Console|Export-Csv|ForEach-Object|Format-Custom|" +
|
||||
"Format-List|Format-Table|Format-Wide|Export-FormatData|Get-FormatData|Get-Item|" +
|
||||
"Get-ChildItem|Get-Help|Add-History|Clear-History|Get-History|Invoke-History|" +
|
||||
"Get-Host|Read-Host|Write-Host|Get-HotFix|Import-Clixml|Import-Csv|" +
|
||||
"Invoke-Command|Invoke-Expression|Get-Item|Invoke-Item|New-Item|Remove-Item|" +
|
||||
"Set-Item|Clear-ItemProperty|Copy-ItemProperty|Get-ItemProperty|Move-ItemProperty|New-ItemProperty|" +
|
||||
"Remove-ItemProperty|Rename-ItemProperty|Set-ItemProperty|Get-Job|Receive-Job|Remove-Job|" +
|
||||
"Start-Job|Stop-Job|Wait-Job|Stop-Process|Update-List|Get-Location|" +
|
||||
"Pop-Location|Push-Location|Set-Location|Send-MailMessage|Add-Member|Get-Member|" +
|
||||
"Move-Item|Compare-Object|Group-Object|Measure-Object|New-Object|Select-Object|" +
|
||||
"Sort-Object|Where-Object|Out-Default|Out-File|Out-GridView|Out-Host|" +
|
||||
"Out-Null|Out-Printer|Out-String|Convert-Path|Join-Path|Resolve-Path|" +
|
||||
"Split-Path|Test-Path|Get-Pfxcertificate|Pop-Location|Push-Location|Get-Process|" +
|
||||
"Start-Process|Stop-Process|Wait-Process|Enable-PSBreakpoint|Disable-PSBreakpoint|Get-PSBreakpoint|" +
|
||||
"Set-PSBreakpoint|Remove-PSBreakpoint|Get-PSDrive|New-PSDrive|Remove-PSDrive|Get-PSProvider|" +
|
||||
"Set-PSdebug|Enter-PSSession|Exit-PSSession|Export-PSSession|Get-PSSession|Import-PSSession|" +
|
||||
"New-PSSession|Remove-PSSession|Disable-PSSessionConfiguration|Enable-PSSessionConfiguration|Get-PSSessionConfiguration|Register-PSSessionConfiguration|" +
|
||||
"Set-PSSessionConfiguration|Unregister-PSSessionConfiguration|New-PSSessionOption|Add-PsSnapIn|Get-PsSnapin|Remove-PSSnapin|" +
|
||||
"Get-Random|Read-Host|Remove-Item|Rename-Item|Rename-ItemProperty|Select-Object|" +
|
||||
"Select-XML|Send-MailMessage|Get-Service|New-Service|Restart-Service|Resume-Service|" +
|
||||
"Set-Service|Start-Service|Stop-Service|Suspend-Service|Sort-Object|Start-Sleep|" +
|
||||
"ConvertFrom-StringData|Select-String|Tee-Object|New-Timespan|Trace-Command|Get-Tracesource|" +
|
||||
"Set-Tracesource|Start-Transaction|Complete-Transaction|Get-Transaction|Use-Transaction|Undo-Transaction|" +
|
||||
"Start-Transcript|Stop-Transcript|Add-Type|Update-TypeData|Get-Uiculture|Get-Unique|" +
|
||||
"Update-Formatdata|Update-Typedata|Clear-Variable|Get-Variable|New-Variable|Remove-Variable|" +
|
||||
"Set-Variable|New-WebServiceProxy|Where-Object|Write-Debug|Write-Error|Write-Host|" +
|
||||
"Write-Output|Write-Progress|Write-Verbose|Write-Warning|Set-WmiInstance|Invoke-WmiMethod|" +
|
||||
"Get-WmiObject|Remove-WmiObject|Connect-WSMan|Disconnect-WSMan|Test-WSMan|Invoke-WSManAction|" +
|
||||
"Disable-WSManCredSSP|Enable-WSManCredSSP|Get-WSManCredSSP|New-WSManInstance|Get-WSManInstance|Set-WSManInstance|" +
|
||||
"Remove-WSManInstance|Set-WSManQuickConfig|New-WSManSessionOption"
|
||||
);
|
||||
// Module AppBackgroundTask
|
||||
"Get-AppBackgroundTask|Start-AppBackgroundTask|Unregister-AppBackgroundTask|Disable-AppBackgroundTaskDiagnosticLog|Enable-AppBackgroundTaskDiagnosticLog|Set-AppBackgroundTaskResourcePolicy|" +
|
||||
// Module AppLocker
|
||||
"Get-AppLockerFileInformation|Get-AppLockerPolicy|New-AppLockerPolicy|Set-AppLockerPolicy|Test-AppLockerPolicy|" +
|
||||
// Module Appx
|
||||
"Get-AppxLastError|Get-AppxLog|Add-AppxPackage|Add-AppxVolume|Dismount-AppxVolume|Get-AppxDefaultVolume|Get-AppxPackage|Get-AppxPackageManifest|Get-AppxVolume|Mount-AppxVolume|Move-AppxPackage|Remove-AppxPackage|Remove-AppxVolume|Set-AppxDefaultVolume|" +
|
||||
// Module AssignedAccess
|
||||
"Clear-AssignedAccess|Get-AssignedAccess|Set-AssignedAccess|" +
|
||||
// Module BitLocker
|
||||
"Add-BitLockerKeyProtector|Backup-BitLockerKeyProtector|Clear-BitLockerAutoUnlock|Disable-BitLocker|Disable-BitLockerAutoUnlock|Enable-BitLocker|Enable-BitLockerAutoUnlock|Get-BitLockerVolume|Lock-BitLocker|Remove-BitLockerKeyProtector|Resume-BitLocker|Suspend-BitLocker|Unlock-BitLocker|" +
|
||||
// Module BitsTransfer
|
||||
"Add-BitsFile|Complete-BitsTransfer|Get-BitsTransfer|Remove-BitsTransfer|Resume-BitsTransfer|Set-BitsTransfer|Start-BitsTransfer|Suspend-BitsTransfer|" +
|
||||
// Module BranchCache
|
||||
"Add-BCDataCacheExtension|Clear-BCCache|Disable-BC|Disable-BCDowngrading|Disable-BCServeOnBattery|Enable-BCDistributed|Enable-BCDowngrading|Enable-BCHostedClient|Enable-BCHostedServer|Enable-BCLocal|Enable-BCServeOnBattery|Export-BCCachePackage|Export-BCSecretKey|Get-BCClientConfiguration|Get-BCContentServerConfiguration|Get-BCDataCache|Get-BCDataCacheExtension|Get-BCHashCache|Get-BCHostedCacheServerConfiguration|Get-BCNetworkConfiguration|Get-BCStatus|Import-BCCachePackage|Import-BCSecretKey|Publish-BCFileContent|Publish-BCWebContent|Remove-BCDataCacheExtension|Reset-BC|Set-BCAuthentication|Set-BCCache|Set-BCDataCacheEntryMaxAge|Set-BCMinSMBLatency|Set-BCSecretKey|" +
|
||||
// Module CimCmdlets
|
||||
"Export-BinaryMiLog|Get-CimAssociatedInstance|Get-CimClass|Get-CimInstance|Get-CimSession|Import-BinaryMiLog|Invoke-CimMethod|New-CimInstance|New-CimSession|New-CimSessionOption|Register-CimIndicationEvent|Remove-CimInstance|Remove-CimSession|Set-CimInstance|" +
|
||||
// Module CIPolicy
|
||||
"ConvertFrom-CIPolicy|" +
|
||||
// Module ConfigCI
|
||||
"Add-SignerRule|Edit-CIPolicyRule|Get-CIPolicy|Get-CIPolicyInfo|Get-SystemDriver|Merge-CIPolicy|New-CIPolicy|New-CIPolicyRule|Remove-CIPolicyRule|Set-CIPolicyVersion|Set-HVCIOptions|Set-RuleOption|" +
|
||||
// Module Defender
|
||||
"Add-MpPreference|Get-MpComputerStatus|Get-MpPreference|Get-MpThreat|Get-MpThreatCatalog|Get-MpThreatDetection|Remove-MpPreference|Remove-MpThreat|Set-MpPreference|Start-MpScan|Start-MpWDOScan|Update-MpSignature|" +
|
||||
// Module DirectAccessClientComponents
|
||||
"Disable-DAManualEntryPointSelection|Enable-DAManualEntryPointSelection|Get-DAClientExperienceConfiguration|Get-DAEntryPointTableItem|New-DAEntryPointTableItem|Remove-DAEntryPointTableItem|Rename-DAEntryPointTableItem|Reset-DAClientExperienceConfiguration|Reset-DAEntryPointTableItem|Set-DAClientExperienceConfiguration|Set-DAEntryPointTableItem|" +
|
||||
// Module Dism
|
||||
"Add-ProvisionedAppxPackage|Apply-WindowsUnattend|Get-ProvisionedAppxPackage|Remove-ProvisionedAppxPackage|Add-AppxProvisionedPackage|Add-WindowsCapability|Add-WindowsDriver|Add-WindowsImage|Add-WindowsPackage|Clear-WindowsCorruptMountPoint|Disable-WindowsOptionalFeature|Dismount-WindowsImage|Enable-WindowsOptionalFeature|Expand-WindowsCustomDataImage|Expand-WindowsImage|Export-WindowsDriver|Export-WindowsImage|Get-AppxProvisionedPackage|Get-WIMBootEntry|Get-WindowsCapability|Get-WindowsDriver|Get-WindowsEdition|Get-WindowsImage|Get-WindowsImageContent|Get-WindowsOptionalFeature|Get-WindowsPackage|Mount-WindowsImage|New-WindowsCustomImage|New-WindowsImage|Optimize-WindowsImage|Remove-AppxProvisionedPackage|Remove-WindowsCapability|Remove-WindowsDriver|Remove-WindowsImage|Remove-WindowsPackage|Repair-WindowsImage|Save-WindowsImage|Set-AppXProvisionedDataFile|Set-WindowsEdition|Set-WindowsProductKey|Split-WindowsImage|Update-WIMBootEntry|Use-WindowsUnattend|" +
|
||||
// Module DnsClient
|
||||
"Add-DnsClientNrptRule|Clear-DnsClientCache|Get-DnsClient|Get-DnsClientCache|Get-DnsClientGlobalSetting|Get-DnsClientNrptGlobal|Get-DnsClientNrptPolicy|Get-DnsClientNrptRule|Get-DnsClientServerAddress|Register-DnsClient|Remove-DnsClientNrptRule|Set-DnsClient|Set-DnsClientGlobalSetting|Set-DnsClientNrptGlobal|Set-DnsClientNrptRule|Set-DnsClientServerAddress|Resolve-DnsName|" +
|
||||
// Module EventTracingManagement
|
||||
"Add-EtwTraceProvider|Get-AutologgerConfig|Get-EtwTraceProvider|Get-EtwTraceSession|New-AutologgerConfig|New-EtwTraceSession|Remove-AutologgerConfig|Remove-EtwTraceProvider|Remove-EtwTraceSession|Send-EtwTraceSession|Set-AutologgerConfig|Set-EtwTraceProvider|Set-EtwTraceSession|" +
|
||||
// Module International
|
||||
"Get-WinAcceptLanguageFromLanguageListOptOut|Get-WinCultureFromLanguageListOptOut|Get-WinDefaultInputMethodOverride|Get-WinHomeLocation|Get-WinLanguageBarOption|Get-WinSystemLocale|Get-WinUILanguageOverride|Get-WinUserLanguageList|New-WinUserLanguageList|Set-Culture|Set-WinAcceptLanguageFromLanguageListOptOut|Set-WinCultureFromLanguageListOptOut|Set-WinDefaultInputMethodOverride|Set-WinHomeLocation|Set-WinLanguageBarOption|Set-WinSystemLocale|Set-WinUILanguageOverride|Set-WinUserLanguageList|" +
|
||||
// Module iSCSI
|
||||
"Connect-IscsiTarget|Disconnect-IscsiTarget|Get-IscsiConnection|Get-IscsiSession|Get-IscsiTarget|Get-IscsiTargetPortal|New-IscsiTargetPortal|Register-IscsiSession|Remove-IscsiTargetPortal|Set-IscsiChapSecret|Unregister-IscsiSession|Update-IscsiTarget|Update-IscsiTargetPortal|" +
|
||||
// Module ISE
|
||||
"Get-IseSnippet|Import-IseSnippet|New-IseSnippet|" +
|
||||
// Module Kds
|
||||
"Add-KdsRootKey|Clear-KdsCache|Get-KdsConfiguration|Get-KdsRootKey|Set-KdsConfiguration|Test-KdsRootKey|" +
|
||||
// Module Microsoft.PowerShell.Archive
|
||||
"Compress-Archive|Expand-Archive|" +
|
||||
// Module Microsoft.PowerShell.Diagnostics
|
||||
"Export-Counter|Get-Counter|Get-WinEvent|Import-Counter|New-WinEvent|" +
|
||||
// Module Microsoft.PowerShell.Host
|
||||
"Start-Transcript|Stop-Transcript|" +
|
||||
// Module Microsoft.PowerShell.Management
|
||||
"Add-Computer|Add-Content|Checkpoint-Computer|Clear-Content|Clear-EventLog|Clear-Item|Clear-ItemProperty|Clear-RecycleBin|Complete-Transaction|Convert-Path|Copy-Item|Copy-ItemProperty|Debug-Process|Disable-ComputerRestore|Enable-ComputerRestore|Get-ChildItem|Get-Clipboard|Get-ComputerRestorePoint|Get-Content|Get-ControlPanelItem|Get-EventLog|Get-HotFix|Get-Item|Get-ItemProperty|Get-ItemPropertyValue|Get-Location|Get-Process|Get-PSDrive|Get-PSProvider|Get-Service|Get-Transaction|Get-WmiObject|Invoke-Item|Invoke-WmiMethod|Join-Path|Limit-EventLog|Move-Item|Move-ItemProperty|New-EventLog|New-Item|New-ItemProperty|New-PSDrive|New-Service|New-WebServiceProxy|Pop-Location|Push-Location|Register-WmiEvent|Remove-Computer|Remove-EventLog|Remove-Item|Remove-ItemProperty|Remove-PSDrive|Remove-WmiObject|Rename-Computer|Rename-Item|Rename-ItemProperty|Reset-ComputerMachinePassword|Resolve-Path|Restart-Computer|Restart-Service|Restore-Computer|Resume-Service|Set-Clipboard|Set-Content|Set-Item|Set-ItemProperty|Set-Location|Set-Service|Set-WmiInstance|Show-ControlPanelItem|Show-EventLog|Split-Path|Start-Process|Start-Service|Start-Transaction|Stop-Computer|Stop-Process|Stop-Service|Suspend-Service|Test-ComputerSecureChannel|Test-Connection|Test-Path|Undo-Transaction|Use-Transaction|Wait-Process|Write-EventLog|" +
|
||||
// Module Microsoft.PowerShell.ODataUtils
|
||||
"Export-ODataEndpointProxy|" +
|
||||
// Module Microsoft.PowerShell.Security
|
||||
"ConvertFrom-SecureString|ConvertTo-SecureString|Get-Acl|Get-AuthenticodeSignature|Get-CmsMessage|Get-Credential|Get-ExecutionPolicy|Get-PfxCertificate|Protect-CmsMessage|Set-Acl|Set-AuthenticodeSignature|Set-ExecutionPolicy|Unprotect-CmsMessage|" +
|
||||
// Module Microsoft.PowerShell.Utility
|
||||
"ConvertFrom-SddlString|Format-Hex|Get-FileHash|Import-PowerShellDataFile|New-Guid|New-TemporaryFile|Add-Member|Add-Type|Clear-Variable|Compare-Object|ConvertFrom-Csv|ConvertFrom-Json|ConvertFrom-String|ConvertFrom-StringData|Convert-String|ConvertTo-Csv|ConvertTo-Html|ConvertTo-Json|ConvertTo-Xml|Debug-Runspace|Disable-PSBreakpoint|Disable-RunspaceDebug|Enable-PSBreakpoint|Enable-RunspaceDebug|Export-Alias|Export-Clixml|Export-Csv|Export-FormatData|Export-PSSession|Format-Custom|Format-List|Format-Table|Format-Wide|Get-Alias|Get-Culture|Get-Date|Get-Event|Get-EventSubscriber|Get-FormatData|Get-Host|Get-Member|Get-PSBreakpoint|Get-PSCallStack|Get-Random|Get-Runspace|Get-RunspaceDebug|Get-TraceSource|Get-TypeData|Get-UICulture|Get-Unique|Get-Variable|Group-Object|Import-Alias|Import-Clixml|Import-Csv|Import-LocalizedData|Import-PSSession|Invoke-Expression|Invoke-RestMethod|Invoke-WebRequest|Measure-Command|Measure-Object|New-Alias|New-Event|New-Object|New-TimeSpan|New-Variable|Out-File|Out-GridView|Out-Printer|Out-String|Read-Host|Register-EngineEvent|Register-ObjectEvent|Remove-Event|Remove-PSBreakpoint|Remove-TypeData|Remove-Variable|Select-Object|Select-String|Select-Xml|Send-MailMessage|Set-Alias|Set-Date|Set-PSBreakpoint|Set-TraceSource|Set-Variable|Show-Command|Sort-Object|Start-Sleep|Tee-Object|Trace-Command|Unblock-File|Unregister-Event|Update-FormatData|Update-List|Update-TypeData|Wait-Debugger|Wait-Event|Write-Debug|Write-Error|Write-Host|Write-Information|Write-Output|Write-Progress|Write-Verbose|Write-Warning|" +
|
||||
// Module Microsoft.WSMan.Management
|
||||
"Connect-WSMan|Disable-WSManCredSSP|Disconnect-WSMan|Enable-WSManCredSSP|Get-WSManCredSSP|Get-WSManInstance|Invoke-WSManAction|New-WSManInstance|New-WSManSessionOption|Remove-WSManInstance|Set-WSManInstance|Set-WSManQuickConfig|Test-WSMan|" +
|
||||
// Module MMAgent
|
||||
"Debug-MMAppPrelaunch|Disable-MMAgent|Enable-MMAgent|Get-MMAgent|Set-MMAgent|" +
|
||||
// Module MsDtc
|
||||
"Add-DtcClusterTMMapping|Get-Dtc|Get-DtcAdvancedHostSetting|Get-DtcAdvancedSetting|Get-DtcClusterDefault|Get-DtcClusterTMMapping|Get-DtcDefault|Get-DtcLog|Get-DtcNetworkSetting|Get-DtcTransaction|Get-DtcTransactionsStatistics|Get-DtcTransactionsTraceSession|Get-DtcTransactionsTraceSetting|Install-Dtc|Remove-DtcClusterTMMapping|Reset-DtcLog|Set-DtcAdvancedHostSetting|Set-DtcAdvancedSetting|Set-DtcClusterDefault|Set-DtcClusterTMMapping|Set-DtcDefault|Set-DtcLog|Set-DtcNetworkSetting|Set-DtcTransaction|Set-DtcTransactionsTraceSession|Set-DtcTransactionsTraceSetting|Start-Dtc|Start-DtcTransactionsTraceSession|Stop-Dtc|Stop-DtcTransactionsTraceSession|Test-Dtc|Uninstall-Dtc|Write-DtcTransactionsTraceSession|Complete-DtcDiagnosticTransaction|Join-DtcDiagnosticResourceManager|New-DtcDiagnosticTransaction|Receive-DtcDiagnosticTransaction|Send-DtcDiagnosticTransaction|Start-DtcDiagnosticResourceManager|Stop-DtcDiagnosticResourceManager|Undo-DtcDiagnosticTransaction|" +
|
||||
// Module NetAdapter
|
||||
"Disable-NetAdapter|Disable-NetAdapterBinding|Disable-NetAdapterChecksumOffload|Disable-NetAdapterEncapsulatedPacketTaskOffload|Disable-NetAdapterIPsecOffload|Disable-NetAdapterLso|Disable-NetAdapterPacketDirect|Disable-NetAdapterPowerManagement|Disable-NetAdapterQos|Disable-NetAdapterRdma|Disable-NetAdapterRsc|Disable-NetAdapterRss|Disable-NetAdapterSriov|Disable-NetAdapterVmq|Enable-NetAdapter|Enable-NetAdapterBinding|Enable-NetAdapterChecksumOffload|Enable-NetAdapterEncapsulatedPacketTaskOffload|Enable-NetAdapterIPsecOffload|Enable-NetAdapterLso|Enable-NetAdapterPacketDirect|Enable-NetAdapterPowerManagement|Enable-NetAdapterQos|Enable-NetAdapterRdma|Enable-NetAdapterRsc|Enable-NetAdapterRss|Enable-NetAdapterSriov|Enable-NetAdapterVmq|Get-NetAdapter|Get-NetAdapterAdvancedProperty|Get-NetAdapterBinding|Get-NetAdapterChecksumOffload|Get-NetAdapterEncapsulatedPacketTaskOffload|Get-NetAdapterHardwareInfo|Get-NetAdapterIPsecOffload|Get-NetAdapterLso|Get-NetAdapterPacketDirect|Get-NetAdapterPowerManagement|Get-NetAdapterQos|Get-NetAdapterRdma|Get-NetAdapterRsc|Get-NetAdapterRss|Get-NetAdapterSriov|Get-NetAdapterSriovVf|Get-NetAdapterStatistics|Get-NetAdapterVmq|Get-NetAdapterVmqQueue|Get-NetAdapterVPort|New-NetAdapterAdvancedProperty|Remove-NetAdapterAdvancedProperty|Rename-NetAdapter|Reset-NetAdapterAdvancedProperty|Restart-NetAdapter|Set-NetAdapter|Set-NetAdapterAdvancedProperty|Set-NetAdapterBinding|Set-NetAdapterChecksumOffload|Set-NetAdapterEncapsulatedPacketTaskOffload|Set-NetAdapterIPsecOffload|Set-NetAdapterLso|Set-NetAdapterPacketDirect|Set-NetAdapterPowerManagement|Set-NetAdapterQos|Set-NetAdapterRdma|Set-NetAdapterRsc|Set-NetAdapterRss|Set-NetAdapterSriov|Set-NetAdapterVmq|" +
|
||||
// Module NetConnection
|
||||
"Get-NetConnectionProfile|Set-NetConnectionProfile|" +
|
||||
// Module NetEventPacketCapture
|
||||
"Add-NetEventNetworkAdapter|Add-NetEventPacketCaptureProvider|Add-NetEventProvider|Add-NetEventVmNetworkAdapter|Add-NetEventVmSwitch|Add-NetEventWFPCaptureProvider|Get-NetEventNetworkAdapter|Get-NetEventPacketCaptureProvider|Get-NetEventProvider|Get-NetEventSession|Get-NetEventVmNetworkAdapter|Get-NetEventVmSwitch|Get-NetEventWFPCaptureProvider|New-NetEventSession|Remove-NetEventNetworkAdapter|Remove-NetEventPacketCaptureProvider|Remove-NetEventProvider|Remove-NetEventSession|Remove-NetEventVmNetworkAdapter|Remove-NetEventVmSwitch|Remove-NetEventWFPCaptureProvider|Set-NetEventPacketCaptureProvider|Set-NetEventProvider|Set-NetEventSession|Set-NetEventWFPCaptureProvider|Start-NetEventSession|Stop-NetEventSession|" +
|
||||
// Module NetLbfo
|
||||
"Add-NetLbfoTeamMember|Add-NetLbfoTeamNic|Get-NetLbfoTeam|Get-NetLbfoTeamMember|Get-NetLbfoTeamNic|New-NetLbfoTeam|Remove-NetLbfoTeam|Remove-NetLbfoTeamMember|Remove-NetLbfoTeamNic|Rename-NetLbfoTeam|Set-NetLbfoTeam|Set-NetLbfoTeamMember|Set-NetLbfoTeamNic|" +
|
||||
// Module NetNat
|
||||
"Add-NetNatExternalAddress|Add-NetNatStaticMapping|Get-NetNat|Get-NetNatExternalAddress|Get-NetNatGlobal|Get-NetNatSession|Get-NetNatStaticMapping|New-NetNat|Remove-NetNat|Remove-NetNatExternalAddress|Remove-NetNatStaticMapping|Set-NetNat|Set-NetNatGlobal|" +
|
||||
// Module NetQos
|
||||
"Get-NetQosPolicy|New-NetQosPolicy|Remove-NetQosPolicy|Set-NetQosPolicy|" +
|
||||
// Module NetSecurity
|
||||
"Copy-NetFirewallRule|Copy-NetIPsecMainModeCryptoSet|Copy-NetIPsecMainModeRule|Copy-NetIPsecPhase1AuthSet|Copy-NetIPsecPhase2AuthSet|Copy-NetIPsecQuickModeCryptoSet|Copy-NetIPsecRule|Disable-NetFirewallRule|Disable-NetIPsecMainModeRule|Disable-NetIPsecRule|Enable-NetFirewallRule|Enable-NetIPsecMainModeRule|Enable-NetIPsecRule|Find-NetIPsecRule|Get-NetFirewallAddressFilter|Get-NetFirewallApplicationFilter|Get-NetFirewallInterfaceFilter|Get-NetFirewallInterfaceTypeFilter|Get-NetFirewallPortFilter|Get-NetFirewallProfile|Get-NetFirewallRule|Get-NetFirewallSecurityFilter|Get-NetFirewallServiceFilter|Get-NetFirewallSetting|Get-NetIPsecDospSetting|Get-NetIPsecMainModeCryptoSet|Get-NetIPsecMainModeRule|Get-NetIPsecMainModeSA|Get-NetIPsecPhase1AuthSet|Get-NetIPsecPhase2AuthSet|Get-NetIPsecQuickModeCryptoSet|Get-NetIPsecQuickModeSA|Get-NetIPsecRule|New-NetFirewallRule|New-NetIPsecDospSetting|New-NetIPsecMainModeCryptoSet|New-NetIPsecMainModeRule|New-NetIPsecPhase1AuthSet|New-NetIPsecPhase2AuthSet|New-NetIPsecQuickModeCryptoSet|New-NetIPsecRule|Open-NetGPO|Remove-NetFirewallRule|Remove-NetIPsecDospSetting|Remove-NetIPsecMainModeCryptoSet|Remove-NetIPsecMainModeRule|Remove-NetIPsecMainModeSA|Remove-NetIPsecPhase1AuthSet|Remove-NetIPsecPhase2AuthSet|Remove-NetIPsecQuickModeCryptoSet|Remove-NetIPsecQuickModeSA|Remove-NetIPsecRule|Rename-NetFirewallRule|Rename-NetIPsecMainModeCryptoSet|Rename-NetIPsecMainModeRule|Rename-NetIPsecPhase1AuthSet|Rename-NetIPsecPhase2AuthSet|Rename-NetIPsecQuickModeCryptoSet|Rename-NetIPsecRule|Save-NetGPO|Set-NetFirewallAddressFilter|Set-NetFirewallApplicationFilter|Set-NetFirewallInterfaceFilter|Set-NetFirewallInterfaceTypeFilter|Set-NetFirewallPortFilter|Set-NetFirewallProfile|Set-NetFirewallRule|Set-NetFirewallSecurityFilter|Set-NetFirewallServiceFilter|Set-NetFirewallSetting|Set-NetIPsecDospSetting|Set-NetIPsecMainModeCryptoSet|Set-NetIPsecMainModeRule|Set-NetIPsecPhase1AuthSet|Set-NetIPsecPhase2AuthSet|Set-NetIPsecQuickModeCryptoSet|Set-NetIPsecRule|Show-NetFirewallRule|Show-NetIPsecRule|Sync-NetIPsecRule|Update-NetIPsecRule|Get-DAPolicyChange|New-NetIPsecAuthProposal|New-NetIPsecMainModeCryptoProposal|New-NetIPsecQuickModeCryptoProposal|" +
|
||||
// Module NetSwitchTeam
|
||||
"Add-NetSwitchTeamMember|Get-NetSwitchTeam|Get-NetSwitchTeamMember|New-NetSwitchTeam|Remove-NetSwitchTeam|Remove-NetSwitchTeamMember|Rename-NetSwitchTeam|" +
|
||||
// Module NetTCPIP
|
||||
"Find-NetRoute|Get-NetCompartment|Get-NetIPAddress|Get-NetIPConfiguration|Get-NetIPInterface|Get-NetIPv4Protocol|Get-NetIPv6Protocol|Get-NetNeighbor|Get-NetOffloadGlobalSetting|Get-NetPrefixPolicy|Get-NetRoute|Get-NetTCPConnection|Get-NetTCPSetting|Get-NetTransportFilter|Get-NetUDPEndpoint|Get-NetUDPSetting|New-NetIPAddress|New-NetNeighbor|New-NetRoute|New-NetTransportFilter|Remove-NetIPAddress|Remove-NetNeighbor|Remove-NetRoute|Remove-NetTransportFilter|Set-NetIPAddress|Set-NetIPInterface|Set-NetIPv4Protocol|Set-NetIPv6Protocol|Set-NetNeighbor|Set-NetOffloadGlobalSetting|Set-NetRoute|Set-NetTCPSetting|Set-NetUDPSetting|Test-NetConnection|" +
|
||||
// Module NetworkConnectivityStatus
|
||||
"Get-DAConnectionStatus|Get-NCSIPolicyConfiguration|Reset-NCSIPolicyConfiguration|Set-NCSIPolicyConfiguration|" +
|
||||
// Module NetworkSwitchManager
|
||||
"Disable-NetworkSwitchEthernetPort|Disable-NetworkSwitchFeature|Disable-NetworkSwitchVlan|Enable-NetworkSwitchEthernetPort|Enable-NetworkSwitchFeature|Enable-NetworkSwitchVlan|Get-NetworkSwitchEthernetPort|Get-NetworkSwitchFeature|Get-NetworkSwitchGlobalData|Get-NetworkSwitchVlan|New-NetworkSwitchVlan|Remove-NetworkSwitchEthernetPortIPAddress|Remove-NetworkSwitchVlan|Restore-NetworkSwitchConfiguration|Save-NetworkSwitchConfiguration|Set-NetworkSwitchEthernetPortIPAddress|Set-NetworkSwitchPortMode|Set-NetworkSwitchPortProperty|Set-NetworkSwitchVlanProperty|" +
|
||||
// Module NetworkTransition
|
||||
"Add-NetIPHttpsCertBinding|Disable-NetDnsTransitionConfiguration|Disable-NetIPHttpsProfile|Disable-NetNatTransitionConfiguration|Enable-NetDnsTransitionConfiguration|Enable-NetIPHttpsProfile|Enable-NetNatTransitionConfiguration|Get-Net6to4Configuration|Get-NetDnsTransitionConfiguration|Get-NetDnsTransitionMonitoring|Get-NetIPHttpsConfiguration|Get-NetIPHttpsState|Get-NetIsatapConfiguration|Get-NetNatTransitionConfiguration|Get-NetNatTransitionMonitoring|Get-NetTeredoConfiguration|Get-NetTeredoState|New-NetIPHttpsConfiguration|New-NetNatTransitionConfiguration|Remove-NetIPHttpsCertBinding|Remove-NetIPHttpsConfiguration|Remove-NetNatTransitionConfiguration|Rename-NetIPHttpsConfiguration|Reset-Net6to4Configuration|Reset-NetDnsTransitionConfiguration|Reset-NetIPHttpsConfiguration|Reset-NetIsatapConfiguration|Reset-NetTeredoConfiguration|Set-Net6to4Configuration|Set-NetDnsTransitionConfiguration|Set-NetIPHttpsConfiguration|Set-NetIsatapConfiguration|Set-NetNatTransitionConfiguration|Set-NetTeredoConfiguration|" +
|
||||
// Module PackageManagement
|
||||
"Find-Package|Find-PackageProvider|Get-Package|Get-PackageProvider|Get-PackageSource|Import-PackageProvider|Install-Package|Install-PackageProvider|Register-PackageSource|Save-Package|Set-PackageSource|Uninstall-Package|Unregister-PackageSource|" +
|
||||
// Module PcsvDevice
|
||||
"Clear-PcsvDeviceLog|Get-PcsvDevice|Get-PcsvDeviceLog|Restart-PcsvDevice|Set-PcsvDeviceBootConfiguration|Set-PcsvDeviceNetworkConfiguration|Set-PcsvDeviceUserPassword|Start-PcsvDevice|Stop-PcsvDevice|" +
|
||||
// Module Pester
|
||||
"AfterAll|AfterEach|Assert-MockCalled|Assert-VerifiableMocks|BeforeAll|BeforeEach|Context|Describe|Get-MockDynamicParameters|Get-TestDriveItem|In|InModuleScope|Invoke-Mock|Invoke-Pester|It|Mock|New-Fixture|Set-DynamicParameterVariables|Setup|Should|" +
|
||||
// Module PKI
|
||||
"Add-CertificateEnrollmentPolicyServer|Export-Certificate|Export-PfxCertificate|Get-Certificate|Get-CertificateAutoEnrollmentPolicy|Get-CertificateEnrollmentPolicyServer|Get-CertificateNotificationTask|Get-PfxData|Import-Certificate|Import-PfxCertificate|New-CertificateNotificationTask|New-SelfSignedCertificate|Remove-CertificateEnrollmentPolicyServer|Remove-CertificateNotificationTask|Set-CertificateAutoEnrollmentPolicy|Switch-Certificate|Test-Certificate|" +
|
||||
// Module PnpDevice
|
||||
"Disable-PnpDevice|Enable-PnpDevice|Get-PnpDevice|Get-PnpDeviceProperty|" +
|
||||
// Module PowerShellGet
|
||||
"Find-DscResource|Find-Module|Find-Script|Get-InstalledModule|Get-InstalledScript|Get-PSRepository|Install-Module|Install-Script|New-ScriptFileInfo|Publish-Module|Publish-Script|Register-PSRepository|Save-Module|Save-Script|Set-PSRepository|Test-ScriptFileInfo|Uninstall-Module|Uninstall-Script|Unregister-PSRepository|Update-Module|Update-ModuleManifest|Update-Script|Update-ScriptFileInfo|" +
|
||||
// Module PrintManagement
|
||||
"Add-Printer|Add-PrinterDriver|Add-PrinterPort|Get-PrintConfiguration|Get-Printer|Get-PrinterDriver|Get-PrinterPort|Get-PrinterProperty|Get-PrintJob|Read-PrinterNfcTag|Remove-Printer|Remove-PrinterDriver|Remove-PrinterPort|Remove-PrintJob|Rename-Printer|Restart-PrintJob|Resume-PrintJob|Set-PrintConfiguration|Set-Printer|Set-PrinterProperty|Suspend-PrintJob|Write-PrinterNfcTag|" +
|
||||
// Module PSDesiredStateConfiguration
|
||||
"Configuration|Disable-DscDebug|Enable-DscDebug|Get-DscConfiguration|Get-DscConfigurationStatus|Get-DscLocalConfigurationManager|Get-DscResource|New-DscChecksum|Remove-DscConfigurationDocument|Restore-DscConfiguration|Stop-DscConfiguration|Invoke-DscResource|Publish-DscConfiguration|Set-DscLocalConfigurationManager|Start-DscConfiguration|Test-DscConfiguration|Update-DscConfiguration|" +
|
||||
// Module PSDiagnostics
|
||||
"Disable-PSTrace|Disable-PSWSManCombinedTrace|Disable-WSManTrace|Enable-PSTrace|Enable-PSWSManCombinedTrace|Enable-WSManTrace|Get-LogProperties|Set-LogProperties|Start-Trace|Stop-Trace|" +
|
||||
// Module PSReadline
|
||||
"PSConsoleHostReadline|Get-PSReadlineKeyHandler|Get-PSReadlineOption|Remove-PSReadlineKeyHandler|Set-PSReadlineKeyHandler|Set-PSReadlineOption|" +
|
||||
// Module PSScheduledJob
|
||||
"Add-JobTrigger|Disable-JobTrigger|Disable-ScheduledJob|Enable-JobTrigger|Enable-ScheduledJob|Get-JobTrigger|Get-ScheduledJob|Get-ScheduledJobOption|New-JobTrigger|New-ScheduledJobOption|Register-ScheduledJob|Remove-JobTrigger|Set-JobTrigger|Set-ScheduledJob|Set-ScheduledJobOption|Unregister-ScheduledJob|" +
|
||||
// Module PSWorkflow
|
||||
"New-PSWorkflowSession|New-PSWorkflowExecutionOption|" +
|
||||
// Module PSWorkflowUtility
|
||||
"Invoke-AsWorkflow|" +
|
||||
// Module ScheduledTasks
|
||||
"Disable-ScheduledTask|Enable-ScheduledTask|Export-ScheduledTask|Get-ClusteredScheduledTask|Get-ScheduledTask|Get-ScheduledTaskInfo|New-ScheduledTask|New-ScheduledTaskAction|New-ScheduledTaskPrincipal|New-ScheduledTaskSettingsSet|New-ScheduledTaskTrigger|Register-ClusteredScheduledTask|Register-ScheduledTask|Set-ClusteredScheduledTask|Set-ScheduledTask|Start-ScheduledTask|Stop-ScheduledTask|Unregister-ClusteredScheduledTask|Unregister-ScheduledTask|" +
|
||||
// Module SecureBoot
|
||||
"Confirm-SecureBootUEFI|Format-SecureBootUEFI|Get-SecureBootPolicy|Get-SecureBootUEFI|Set-SecureBootUEFI|" +
|
||||
// Module SmbShare
|
||||
"Block-SmbShareAccess|Close-SmbOpenFile|Close-SmbSession|Disable-SmbDelegation|Enable-SmbDelegation|Get-SmbBandwidthLimit|Get-SmbClientConfiguration|Get-SmbClientNetworkInterface|Get-SmbConnection|Get-SmbDelegation|Get-SmbMapping|Get-SmbMultichannelConnection|Get-SmbMultichannelConstraint|Get-SmbOpenFile|Get-SmbServerConfiguration|Get-SmbServerNetworkInterface|Get-SmbSession|Get-SmbShare|Get-SmbShareAccess|Grant-SmbShareAccess|New-SmbMapping|New-SmbMultichannelConstraint|New-SmbShare|Remove-SmbBandwidthLimit|Remove-SmbMapping|Remove-SmbMultichannelConstraint|Remove-SmbShare|Revoke-SmbShareAccess|Set-SmbBandwidthLimit|Set-SmbClientConfiguration|Set-SmbPathAcl|Set-SmbServerConfiguration|Set-SmbShare|Unblock-SmbShareAccess|Update-SmbMultichannelConnection|" +
|
||||
// Module SmbWitness
|
||||
"Move-SmbClient|Get-SmbWitnessClient|Move-SmbWitnessClient|" +
|
||||
// Module StartLayout
|
||||
"Get-StartApps|Export-StartLayout|Import-StartLayout|" +
|
||||
// Module Storage
|
||||
"Disable-PhysicalDiskIndication|Disable-StorageDiagnosticLog|Enable-PhysicalDiskIndication|Enable-StorageDiagnosticLog|Flush-Volume|Get-DiskSNV|Get-PhysicalDiskSNV|Get-StorageEnclosureSNV|Initialize-Volume|Write-FileSystemCache|Add-InitiatorIdToMaskingSet|Add-PartitionAccessPath|Add-PhysicalDisk|Add-TargetPortToMaskingSet|Add-VirtualDiskToMaskingSet|Block-FileShareAccess|Clear-Disk|Clear-FileStorageTier|Clear-StorageDiagnosticInfo|Connect-VirtualDisk|Debug-FileShare|Debug-StorageSubSystem|Debug-Volume|Disable-PhysicalDiskIdentification|Disable-StorageEnclosureIdentification|Disable-StorageHighAvailability|Disconnect-VirtualDisk|Dismount-DiskImage|Enable-PhysicalDiskIdentification|Enable-StorageEnclosureIdentification|Enable-StorageHighAvailability|Format-Volume|Get-DedupProperties|Get-Disk|Get-DiskImage|Get-DiskStorageNodeView|Get-FileIntegrity|Get-FileShare|Get-FileShareAccessControlEntry|Get-FileStorageTier|Get-InitiatorId|Get-InitiatorPort|Get-MaskingSet|Get-OffloadDataTransferSetting|Get-Partition|Get-PartitionSupportedSize|Get-PhysicalDisk|Get-PhysicalDiskStorageNodeView|Get-ResiliencySetting|Get-StorageAdvancedProperty|Get-StorageDiagnosticInfo|Get-StorageEnclosure|Get-StorageEnclosureStorageNodeView|Get-StorageEnclosureVendorData|Get-StorageFaultDomain|Get-StorageFileServer|Get-StorageFirmwareInformation|Get-StorageHealthAction|Get-StorageHealthReport|Get-StorageHealthSetting|Get-StorageJob|Get-StorageNode|Get-StoragePool|Get-StorageProvider|Get-StorageReliabilityCounter|Get-StorageSetting|Get-StorageSubSystem|Get-StorageTier|Get-StorageTierSupportedSize|Get-SupportedClusterSizes|Get-SupportedFileSystems|Get-TargetPort|Get-TargetPortal|Get-VirtualDisk|Get-VirtualDiskSupportedSize|Get-Volume|Get-VolumeCorruptionCount|Get-VolumeScrubPolicy|Grant-FileShareAccess|Hide-VirtualDisk|Initialize-Disk|Mount-DiskImage|New-FileShare|New-MaskingSet|New-Partition|New-StorageFileServer|New-StoragePool|New-StorageSubsystemVirtualDisk|New-StorageTier|New-VirtualDisk|New-VirtualDiskClone|New-VirtualDiskSnapshot|New-Volume|Optimize-StoragePool|Optimize-Volume|Register-StorageSubsystem|Remove-FileShare|Remove-InitiatorId|Remove-InitiatorIdFromMaskingSet|Remove-MaskingSet|Remove-Partition|Remove-PartitionAccessPath|Remove-PhysicalDisk|Remove-StorageFileServer|Remove-StorageHealthSetting|Remove-StoragePool|Remove-StorageTier|Remove-TargetPortFromMaskingSet|Remove-VirtualDisk|Remove-VirtualDiskFromMaskingSet|Rename-MaskingSet|Repair-FileIntegrity|Repair-VirtualDisk|Repair-Volume|Reset-PhysicalDisk|Reset-StorageReliabilityCounter|Resize-Partition|Resize-StorageTier|Resize-VirtualDisk|Revoke-FileShareAccess|Set-Disk|Set-FileIntegrity|Set-FileShare|Set-FileStorageTier|Set-InitiatorPort|Set-Partition|Set-PhysicalDisk|Set-ResiliencySetting|Set-StorageFileServer|Set-StorageHealthSetting|Set-StoragePool|Set-StorageProvider|Set-StorageSetting|Set-StorageSubSystem|Set-StorageTier|Set-VirtualDisk|Set-Volume|Set-VolumeScrubPolicy|Show-VirtualDisk|Start-StorageDiagnosticLog|Stop-StorageDiagnosticLog|Stop-StorageJob|Unblock-FileShareAccess|Unregister-StorageSubsystem|Update-Disk|Update-HostStorageCache|Update-StorageFirmware|Update-StoragePool|Update-StorageProviderCache|Write-VolumeCache|" +
|
||||
// Module TLS
|
||||
"Disable-TlsCipherSuite|Disable-TlsSessionTicketKey|Enable-TlsCipherSuite|Enable-TlsSessionTicketKey|Export-TlsSessionTicketKey|Get-TlsCipherSuite|New-TlsSessionTicketKey|" +
|
||||
// Module TroubleshootingPack
|
||||
"Get-TroubleshootingPack|Invoke-TroubleshootingPack|" +
|
||||
// Module TrustedPlatformModule
|
||||
"Clear-Tpm|ConvertTo-TpmOwnerAuth|Disable-TpmAutoProvisioning|Enable-TpmAutoProvisioning|Get-Tpm|Get-TpmEndorsementKeyInfo|Get-TpmSupportedFeature|Import-TpmOwnerAuth|Initialize-Tpm|Set-TpmOwnerAuth|Unblock-Tpm|" +
|
||||
// Module VpnClient
|
||||
"Add-VpnConnection|Add-VpnConnectionRoute|Add-VpnConnectionTriggerApplication|Add-VpnConnectionTriggerDnsConfiguration|Add-VpnConnectionTriggerTrustedNetwork|Get-VpnConnection|Get-VpnConnectionTrigger|New-EapConfiguration|New-VpnServerAddress|Remove-VpnConnection|Remove-VpnConnectionRoute|Remove-VpnConnectionTriggerApplication|Remove-VpnConnectionTriggerDnsConfiguration|Remove-VpnConnectionTriggerTrustedNetwork|Set-VpnConnection|Set-VpnConnectionIPsecConfiguration|Set-VpnConnectionProxy|Set-VpnConnectionTriggerDnsConfiguration|Set-VpnConnectionTriggerTrustedNetwork|" +
|
||||
// Module Wdac
|
||||
"Add-OdbcDsn|Disable-OdbcPerfCounter|Disable-WdacBidTrace|Enable-OdbcPerfCounter|Enable-WdacBidTrace|Get-OdbcDriver|Get-OdbcDsn|Get-OdbcPerfCounter|Get-WdacBidTrace|Remove-OdbcDsn|Set-OdbcDriver|Set-OdbcDsn|" +
|
||||
// Module WindowsDeveloperLicense
|
||||
"Get-WindowsDeveloperLicense|Show-WindowsDeveloperLicenseRegistration|Unregister-WindowsDeveloperLicense|" +
|
||||
// Module WindowsErrorReporting
|
||||
"Disable-WindowsErrorReporting|Enable-WindowsErrorReporting|Get-WindowsErrorReporting|" +
|
||||
// Module WindowsSearch
|
||||
"Get-WindowsSearchSetting|Set-WindowsSearchSetting|" +
|
||||
// Module WindowsUpdate
|
||||
"Get-WindowsUpdateLog"
|
||||
);
|
||||
|
||||
var keywordMapper = this.createKeywordMapper({
|
||||
"support.function": builtinFunctions,
|
||||
"keyword": keywords
|
||||
}, "identifier");
|
||||
|
||||
var binaryOperatorsRe = "eq|ne|ge|gt|lt|le|like|notlike|match|notmatch|replace|contains|notcontains|" +
|
||||
"ieq|ine|ige|igt|ile|ilt|ilike|inotlike|imatch|inotmatch|ireplace|icontains|inotcontains|" +
|
||||
"is|isnot|as|" +
|
||||
"and|or|band|bor|not";
|
||||
// Help Reference: about_Operators
|
||||
// https://technet.microsoft.com/en-us/library/hh847732.aspx
|
||||
var binaryOperatorsRe = (
|
||||
// Comparison Operators
|
||||
"eq|ne|gt|lt|le|ge|like|notlike|match|notmatch|contains|notcontains|in|notin|band|bor|bxor|bnot|" +
|
||||
"ceq|cne|cgt|clt|cle|cge|clike|cnotlike|cmatch|cnotmatch|ccontains|cnotcontains|cin|cnotin|" +
|
||||
"ieq|ine|igt|ilt|ile|ige|ilike|inotlike|imatch|inotmatch|icontains|inotcontains|iin|inotin|" +
|
||||
// Logical Operators
|
||||
"and|or|xor|not|" +
|
||||
// String Operators
|
||||
"split|join|replace|f|" +
|
||||
"csplit|creplace|" +
|
||||
"isplit|ireplace|" +
|
||||
// Type Operators
|
||||
"is|isnot|as|" +
|
||||
// Shift Operators
|
||||
"shl|shr"
|
||||
);
|
||||
|
||||
// regexp must not have capturing parentheses. Use (?:) instead.
|
||||
// regexps are ordered -> the first match is used
|
||||
|
@ -107,8 +224,9 @@ var PowershellHighlightRules = function() {
|
|||
token : "keyword.operator",
|
||||
regex : "\\-(?:" + binaryOperatorsRe + ")"
|
||||
}, {
|
||||
// Arithmetic, Assignment, Redirection, Call, Not & Pipeline Operators
|
||||
token : "keyword.operator",
|
||||
regex : "&|\\*|\\+|\\-|\\=|\\+=|\\-="
|
||||
regex : "&|\\+|\\-|\\*|\\/|\\%|\\=|\\>|\\&|\\!|\\|"
|
||||
}, {
|
||||
token : "lparen",
|
||||
regex : "[[({]"
|
||||
|
@ -129,11 +247,7 @@ var PowershellHighlightRules = function() {
|
|||
token : "doc.comment.tag",
|
||||
regex : "^\\.\\w+"
|
||||
}, {
|
||||
token : "comment",
|
||||
regex : "\\w+"
|
||||
}, {
|
||||
token : "comment",
|
||||
regex : "."
|
||||
defaultToken : "comment"
|
||||
}
|
||||
]
|
||||
};
|
||||
|
|
|
@ -66,7 +66,7 @@ oop.inherits(Mode, TextMode);
|
|||
var match = line.match(/^.*[\{\(\[]\s*$/);
|
||||
var startingClassOrMethod = line.match(/^\s*(class|def|module)\s.*$/);
|
||||
var startingDoBlock = line.match(/.*do(\s*|\s+\|.*\|\s*)$/);
|
||||
var startingConditional = line.match(/^\s*(if|else)\s*/)
|
||||
var startingConditional = line.match(/^\s*(if|else|when)\s*/)
|
||||
if (match || startingClassOrMethod || startingDoBlock || startingConditional) {
|
||||
indent += tab;
|
||||
}
|
||||
|
|
|
@ -126,6 +126,11 @@ var TextHighlightRules = function() {
|
|||
state.processed = true;
|
||||
for (var i = 0; i < state.length; i++) {
|
||||
var rule = state[i];
|
||||
var toInsert = null;
|
||||
if (Array.isArray(rule)) {
|
||||
toInsert = rule;
|
||||
rule = {};
|
||||
}
|
||||
if (!rule.regex && rule.start) {
|
||||
rule.regex = rule.start;
|
||||
if (!rule.next)
|
||||
|
@ -173,11 +178,14 @@ var TextHighlightRules = function() {
|
|||
}
|
||||
}
|
||||
}
|
||||
if (rule.include || typeof rule == "string") {
|
||||
var includeName = rule.include || rule;
|
||||
var toInsert = rules[includeName];
|
||||
} else if (Array.isArray(rule))
|
||||
toInsert = rule;
|
||||
var includeName = typeof rule == "string"
|
||||
? rule
|
||||
: typeof rule.include == "string"
|
||||
? rule.include
|
||||
: "";
|
||||
if (includeName) {
|
||||
toInsert = rules[includeName];
|
||||
}
|
||||
|
||||
if (toInsert) {
|
||||
var args = [i, 1].concat(toInsert);
|
||||
|
@ -187,7 +195,6 @@ var TextHighlightRules = function() {
|
|||
// skip included rules since they are already processed
|
||||
//i += args.length - 3;
|
||||
i--;
|
||||
toInsert = null;
|
||||
}
|
||||
|
||||
if (rule.keywordMap) {
|
||||
|
|
|
@ -40,8 +40,38 @@ var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
|
|||
|
||||
var VBScriptHighlightRules = function() {
|
||||
|
||||
// regexp must not have capturing parentheses. Use (?:) instead.
|
||||
// regexps are ordered -> the first match is used
|
||||
var keywordMapper = this.createKeywordMapper({
|
||||
"keyword.control.asp": "If|Then|Else|ElseIf|End|While|Wend|For|To|Each|Case|Select|Return"
|
||||
+ "|Continue|Do|Until|Loop|Next|With|Exit|Function|Property|Type|Enum|Sub|IIf",
|
||||
"storage.type.asp": "Dim|Call|Class|Const|Dim|Redim|Set|Let|Get|New|Randomize|Option|Explicit",
|
||||
"storage.modifier.asp": "Private|Public|Default",
|
||||
"keyword.operator.asp": "Mod|And|Not|Or|Xor|as",
|
||||
"constant.language.asp": "Empty|False|Nothing|Null|True",
|
||||
"support.class.asp": "Application|ObjectContext|Request|Response|Server|Session",
|
||||
"support.class.collection.asp": "Contents|StaticObjects|ClientCertificate|Cookies|Form|QueryString|ServerVariables",
|
||||
"support.constant.asp": "TotalBytes|Buffer|CacheControl|Charset|ContentType|Expires|ExpiresAbsolute"
|
||||
+ "|IsClientConnected|PICS|Status|ScriptTimeout|CodePage|LCID|SessionID|Timeout",
|
||||
"support.function.asp": "Lock|Unlock|SetAbort|SetComplete|BinaryRead|AddHeader|AppendToLog"
|
||||
+ "|BinaryWrite|Clear|Flush|Redirect|Write|CreateObject|HTMLEncode|MapPath|URLEncode|Abandon|Convert|Regex",
|
||||
"support.function.event.asp": "Application_OnEnd|Application_OnStart"
|
||||
+ "|OnTransactionAbort|OnTransactionCommit|Session_OnEnd|Session_OnStart",
|
||||
"support.function.vb.asp": "Array|Add|Asc|Atn|CBool|CByte|CCur|CDate|CDbl|Chr|CInt|CLng"
|
||||
+ "|Conversions|Cos|CreateObject|CSng|CStr|Date|DateAdd|DateDiff|DatePart|DateSerial"
|
||||
+ "|DateValue|Day|Derived|Math|Escape|Eval|Exists|Exp|Filter|FormatCurrency"
|
||||
+ "|FormatDateTime|FormatNumber|FormatPercent|GetLocale|GetObject|GetRef|Hex"
|
||||
+ "|Hour|InputBox|InStr|InStrRev|Int|Fix|IsArray|IsDate|IsEmpty|IsNull|IsNumeric"
|
||||
+ "|IsObject|Item|Items|Join|Keys|LBound|LCase|Left|Len|LoadPicture|Log|LTrim|RTrim"
|
||||
+ "|Trim|Maths|Mid|Minute|Month|MonthName|MsgBox|Now|Oct|Remove|RemoveAll|Replace"
|
||||
+ "|RGB|Right|Rnd|Round|ScriptEngine|ScriptEngineBuildVersion|ScriptEngineMajorVersion"
|
||||
+ "|ScriptEngineMinorVersion|Second|SetLocale|Sgn|Sin|Space|Split|Sqr|StrComp|String|StrReverse"
|
||||
+ "|Tan|Time|Timer|TimeSerial|TimeValue|TypeName|UBound|UCase|Unescape|VarType|Weekday|WeekdayName|Year",
|
||||
"support.type.vb.asp": "vbtrue|vbfalse|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|"
|
||||
+ "int32|vbtab|vbverticaltab|vbbinarycompare|vbtextcomparevbsunday|vbmonday|vbtuesday|vbwednesday"
|
||||
+ "|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek"
|
||||
+ "|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbEmpty|vbNull|vbInteger"
|
||||
+ "|vbLong|vbSingle|vbDouble|vbCurrency|vbDate|vbString|vbObject|vbError|vbBoolean|vbVariant"
|
||||
+ "|vbDataObject|vbDecimal|vbByte|vbArray"
|
||||
}, "identifier", true);
|
||||
|
||||
this.$rules = {
|
||||
"start": [
|
||||
|
@ -51,16 +81,8 @@ var VBScriptHighlightRules = function() {
|
|||
],
|
||||
regex: "$"
|
||||
},
|
||||
// {
|
||||
// token: [
|
||||
// "#round-brackets"
|
||||
// ],
|
||||
// regex: ""
|
||||
// },
|
||||
{
|
||||
token: [
|
||||
null
|
||||
],
|
||||
token: [null],
|
||||
regex: "^(?=\\t)",
|
||||
next: "state_3"
|
||||
},
|
||||
|
@ -80,39 +102,17 @@ var VBScriptHighlightRules = function() {
|
|||
"variable.parameter.function.asp",
|
||||
"punctuation.definition.parameters.asp"
|
||||
],
|
||||
regex: "^(\\s*)(Function|Sub)(\\s*)([a-zA-Z_]\\w*)(\\s*)(\\()([^)]*)(\\))"
|
||||
regex: "^(\\s*)(Function|Sub)(\\s+)([a-zA-Z_]\\w*)(\\s*)(\\()([^)]*)(\\))"
|
||||
},
|
||||
{
|
||||
token: "punctuation.definition.comment.asp",
|
||||
regex: "'|REM",
|
||||
regex: "'|REM(?=\\s|$)",
|
||||
next: "comment",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
token: [
|
||||
"keyword.control.asp"
|
||||
],
|
||||
regex: "\\b(?:If|Then|Else|ElseIf|Else If|End If|While|Wend|For|To|Each|Case|Select|End Select|Return|Continue|Do|Until|Loop|Next|With|Exit Do|Exit For|Exit Function|Exit Property|Exit Sub|IIf)\\b",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
token: "keyword.operator.asp",
|
||||
regex: "\\b(?:Mod|And|Not|Or|Xor|as)\\b",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
token: "storage.type.asp",
|
||||
regex: "Dim|Call|Class|Const|Dim|Redim|Function|Sub|Private Sub|Public Sub|End sub|End Function|Set|Let|Get|New|Randomize|Option Explicit|On Error Resume Next|On Error GoTo",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
token: "storage.modifier.asp",
|
||||
regex: "\\b(?:Private|Public|Default)\\b",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
token: "constant.language.asp",
|
||||
regex: "\\b(?:Empty|False|Nothing|Null|True)\\b",
|
||||
regex: "On Error Resume Next|On Error GoTo",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
|
@ -126,31 +126,6 @@ var VBScriptHighlightRules = function() {
|
|||
],
|
||||
regex: "(\\$)[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\\b\\s*"
|
||||
},
|
||||
{
|
||||
token: "support.class.asp",
|
||||
regex: "\\b(?:Application|ObjectContext|Request|Response|Server|Session)\\b",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
token: "support.class.collection.asp",
|
||||
regex: "\\b(?:Contents|StaticObjects|ClientCertificate|Cookies|Form|QueryString|ServerVariables)\\b",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
token: "support.constant.asp",
|
||||
regex: "\\b(?:TotalBytes|Buffer|CacheControl|Charset|ContentType|Expires|ExpiresAbsolute|IsClientConnected|PICS|Status|ScriptTimeout|CodePage|LCID|SessionID|Timeout)\\b",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
token: "support.function.asp",
|
||||
regex: "\\b(?:Lock|Unlock|SetAbort|SetComplete|BinaryRead|AddHeader|AppendToLog|BinaryWrite|Clear|End|Flush|Redirect|Write|CreateObject|HTMLEncode|MapPath|URLEncode|Abandon|Convert|Regex)\\b",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
token: "support.function.event.asp",
|
||||
regex: "\\b(?:Application_OnEnd|Application_OnStart|OnTransactionAbort|OnTransactionCommit|Session_OnEnd|Session_OnStart)\\b",
|
||||
caseInsensitive: true
|
||||
},
|
||||
// {
|
||||
// token: [
|
||||
// "support.type.vb.asp"
|
||||
|
@ -158,25 +133,15 @@ var VBScriptHighlightRules = function() {
|
|||
// regex: "(?:(?<=as )(\\b[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\\b))", // ERROR: This contains a lookbehind, which JS does not support :("
|
||||
// },
|
||||
{
|
||||
token: "support.function.vb.asp",
|
||||
regex: "\\b(?:Array|Add|Asc|Atn|CBool|CByte|CCur|CDate|CDbl|Chr|CInt|CLng|Conversions|Cos|CreateObject|CSng|CStr|Date|DateAdd|DateDiff|DatePart|DateSerial|DateValue|Day|Derived|Math|Escape|Eval|Exists|Exp|Filter|FormatCurrency|FormatDateTime|FormatNumber|FormatPercent|GetLocale|GetObject|GetRef|Hex|Hour|InputBox|InStr|InStrRev|Int|Fix|IsArray|IsDate|IsEmpty|IsNull|IsNumeric|IsObject|Item|Items|Join|Keys|LBound|LCase|Left|Len|LoadPicture|Log|LTrim|RTrim|Trim|Maths|Mid|Minute|Month|MonthName|MsgBox|Now|Oct|Remove|RemoveAll|Replace|RGB|Right|Rnd|Round|ScriptEngine|ScriptEngineBuildVersion|ScriptEngineMajorVersion|ScriptEngineMinorVersion|Second|SetLocale|Sgn|Sin|Space|Split|Sqr|StrComp|String|StrReverse|Tan|Time|Timer|TimeSerial|TimeValue|TypeName|UBound|UCase|Unescape|VarType|Weekday|WeekdayName|Year)\\b",
|
||||
caseInsensitive: true
|
||||
},
|
||||
{
|
||||
token: [
|
||||
"constant.numeric.asp"
|
||||
],
|
||||
token: "constant.numeric.asp",
|
||||
regex: "-?\\b(?:(?:0(?:x|X)[0-9a-fA-F]*)|(?:(?:[0-9]+\\.?[0-9]*)|(?:\\.[0-9]+))(?:(?:e|E)(?:\\+|-)?[0-9]+)?)(?:L|l|UL|ul|u|U|F|f)?\\b"
|
||||
},
|
||||
{
|
||||
token: "support.type.vb.asp",
|
||||
regex: "\\b(?:vbtrue|vbfalse|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|int32|vbtab|vbverticaltab|vbbinarycompare|vbtextcomparevbsunday|vbmonday|vbtuesday|vbwednesday|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbEmpty|vbNull|vbInteger|vbLong|vbSingle|vbDouble|vbCurrency|vbDate|vbString|vbObject|vbError|vbBoolean|vbVariant|vbDataObject|vbDecimal|vbByte|vbArray)\\b",
|
||||
caseInsensitive: true
|
||||
regex: "\\w+",
|
||||
token: keywordMapper
|
||||
},
|
||||
{
|
||||
token: [
|
||||
"entity.name.function.asp"
|
||||
],
|
||||
token: ["entity.name.function.asp"],
|
||||
regex: "(?:(\\b[a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?\\b)(?=\\(\\)?))"
|
||||
},
|
||||
// {
|
||||
|
@ -186,9 +151,7 @@ var VBScriptHighlightRules = function() {
|
|||
// regex: "(?:((?<=(\\+|=|-|\\&|\\\\|/|<|>|\\(|,))\\s*\\b([a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?)\\b(?!(\\(|\\.))|\\b([a-zA-Z_x7f-xff][a-zA-Z0-9_x7f-xff]*?)\\b(?=\\s*(\\+|=|-|\\&|\\\\|/|<|>|\\(|\\)))))", // ERROR: This contains a lookbehind, which JS does not support :("
|
||||
// },
|
||||
{
|
||||
token: [
|
||||
"keyword.operator.asp"
|
||||
],
|
||||
token: ["keyword.operator.asp"],
|
||||
regex: "\\-|\\+|\\*\\\/|\\>|\\<|\\=|\\&"
|
||||
}
|
||||
],
|
||||
|
@ -256,4 +219,4 @@ var VBScriptHighlightRules = function() {
|
|||
oop.inherits(VBScriptHighlightRules, TextHighlightRules);
|
||||
|
||||
exports.VBScriptHighlightRules = VBScriptHighlightRules;
|
||||
});
|
||||
});
|
||||
|
|
|
@ -50,11 +50,11 @@ var MouseHandler = function(editor) {
|
|||
var focusEditor = function(e) {
|
||||
// because we have to call event.preventDefault() any window on ie and iframes
|
||||
// on other browsers do not get focus, so we have to call window.focus() here
|
||||
if (!document.hasFocus || !document.hasFocus())
|
||||
var windowBlurred = !document.hasFocus || !document.hasFocus()
|
||||
|| !editor.isFocused() && document.activeElement == (editor.textInput && editor.textInput.getElement())
|
||||
if (windowBlurred)
|
||||
window.focus();
|
||||
editor.focus();
|
||||
if (!editor.isFocused())
|
||||
window.focus();
|
||||
};
|
||||
|
||||
var mouseTarget = editor.renderer.getMouseEventTarget();
|
||||
|
|
|
@ -250,7 +250,7 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
|
|||
var undoManager = this.session.getUndoManager();
|
||||
var undosRequired = (undoManager.$undoStack || undoManager.$undostack).length - this.$undoStackDepth;
|
||||
for (var i = 0; i < undosRequired; i++) {
|
||||
undoManager.undo(true);
|
||||
undoManager.undo(this.session, true);
|
||||
}
|
||||
if (this.selectionBefore)
|
||||
this.session.selection.fromJSON(this.selectionBefore);
|
||||
|
|
|
@ -154,6 +154,9 @@ var UndoManager = function() {
|
|||
if (!rearrangeUndoStack(stack, stack.length))
|
||||
return;
|
||||
|
||||
if (!session)
|
||||
session = this.$session;
|
||||
|
||||
if (this.$redoStackBaseRev !== this.$rev && this.$redoStack.length)
|
||||
this.$redoStack = [];
|
||||
|
||||
|
@ -180,6 +183,9 @@ var UndoManager = function() {
|
|||
this.redo = function(session, dontSelect) {
|
||||
this.lastDeltas = null;
|
||||
|
||||
if (!session)
|
||||
session = this.$session;
|
||||
|
||||
this.$fromUndo = true;
|
||||
if (this.$redoStackBaseRev != this.$rev) {
|
||||
var diff = this.getDeltas(this.$redoStackBaseRev, this.$rev + 1);
|
||||
|
|
|
@ -913,12 +913,13 @@ var VirtualRenderer = function(container, theme) {
|
|||
this.$autosize = function() {
|
||||
var height = this.session.getScreenLength() * this.lineHeight;
|
||||
var maxHeight = this.$maxLines * this.lineHeight;
|
||||
var desiredHeight = Math.max(
|
||||
(this.$minLines||1) * this.lineHeight,
|
||||
Math.min(maxHeight, height)
|
||||
var desiredHeight = Math.min(maxHeight,
|
||||
Math.max((this.$minLines || 1) * this.lineHeight, height)
|
||||
) + this.scrollMargin.v + (this.$extraHeight || 0);
|
||||
if (this.$horizScroll)
|
||||
desiredHeight += this.scrollBarH.getHeight();
|
||||
if (this.$maxPixelHeight && desiredHeight > this.$maxPixelHeight)
|
||||
desiredHeight = this.$maxPixelHeight;
|
||||
var vScroll = height > maxHeight;
|
||||
|
||||
if (desiredHeight != this.desiredHeight ||
|
||||
|
@ -1726,6 +1727,12 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", {
|
|||
this.updateFull();
|
||||
}
|
||||
},
|
||||
maxPixelHeight: {
|
||||
set: function(val) {
|
||||
this.updateFull();
|
||||
},
|
||||
initialValue: 0
|
||||
},
|
||||
scrollPastEnd: {
|
||||
set: function(val) {
|
||||
val = +val || 0;
|
||||
|
|
Ładowanie…
Reference in New Issue