Merge branch 'master' of https://github.com/ajaxorg/ace
Conflicts: plugins/cockpit/cli.js plugins/cockpit/lib/ui/plain.js plugins/cockpit/ui/plain.css plugins/cockpit/ui/plain.js plugins/pilot/canon.js plugins/pilot/lib/commands/history.js
This commit is contained in:
Joe Walker
commit
0f505962d0
126 changed files with 3375 additions and 3518 deletions
291
plugins/pilot/types/basic.js
Normal file
291
plugins/pilot/types/basic.js
Normal file
|
|
@ -0,0 +1,291 @@
|
|||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mozilla Skywriter.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Mozilla.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2009
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Joe Walker (jwalker@mozilla.com)
|
||||
* Kevin Dangoor (kdangoor@mozilla.com)
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var types = require("pilot/types");
|
||||
var Type = types.Type;
|
||||
var Conversion = types.Conversion;
|
||||
var Status = types.Status;
|
||||
|
||||
/**
|
||||
* These are the basic types that we accept. They are vaguely based on the
|
||||
* Jetpack settings system (https://wiki.mozilla.org/Labs/Jetpack/JEP/24)
|
||||
* although clearly more restricted.
|
||||
*
|
||||
* <p>In addition to these types, Jetpack also accepts range, member, password
|
||||
* that we are thinking of adding.
|
||||
*
|
||||
* <p>This module probably should not be accessed directly, but instead used
|
||||
* through types.js
|
||||
*/
|
||||
|
||||
/**
|
||||
* 'text' is the default if no type is given.
|
||||
*/
|
||||
var text = new Type();
|
||||
|
||||
text.stringify = function(value) {
|
||||
return value;
|
||||
};
|
||||
|
||||
text.parse = function(value) {
|
||||
if (typeof value != 'string') {
|
||||
throw new Error('non-string passed to text.parse()');
|
||||
}
|
||||
return new Conversion(value);
|
||||
};
|
||||
|
||||
text.name = 'text';
|
||||
|
||||
/**
|
||||
* We don't currently plan to distinguish between integers and floats
|
||||
*/
|
||||
var number = new Type();
|
||||
|
||||
number.stringify = function(value) {
|
||||
if (!value) {
|
||||
return null;
|
||||
}
|
||||
return '' + value;
|
||||
};
|
||||
|
||||
number.parse = function(value) {
|
||||
if (typeof value != 'string') {
|
||||
throw new Error('non-string passed to number.parse()');
|
||||
}
|
||||
|
||||
if (value.replace(/\s/g, '').length === 0) {
|
||||
return new Conversion(null, Status.INCOMPLETE, '');
|
||||
}
|
||||
|
||||
var reply = new Conversion(parseInt(value, 10));
|
||||
if (isNaN(reply.value)) {
|
||||
reply.status = Status.INVALID;
|
||||
reply.message = 'Can\'t convert "' + value + '" to a number.';
|
||||
}
|
||||
|
||||
return reply;
|
||||
};
|
||||
|
||||
number.decrement = function(value) {
|
||||
return value - 1;
|
||||
};
|
||||
|
||||
number.increment = function(value) {
|
||||
return value + 1;
|
||||
};
|
||||
|
||||
number.name = 'number';
|
||||
|
||||
/**
|
||||
* One of a known set of options
|
||||
*/
|
||||
function SelectionType(typeSpec) {
|
||||
if (!Array.isArray(typeSpec.data) && typeof typeSpec.data !== 'function') {
|
||||
throw new Error('instances of SelectionType need typeSpec.data to be an array or function that returns an array:' + JSON.stringify(typeSpec));
|
||||
}
|
||||
Object.keys(typeSpec).forEach(function(key) {
|
||||
this[key] = typeSpec[key];
|
||||
}, this);
|
||||
};
|
||||
|
||||
SelectionType.prototype = new Type();
|
||||
|
||||
SelectionType.prototype.stringify = function(value) {
|
||||
return value;
|
||||
};
|
||||
|
||||
SelectionType.prototype.parse = function(str) {
|
||||
if (typeof str != 'string') {
|
||||
throw new Error('non-string passed to parse()');
|
||||
}
|
||||
if (!this.data) {
|
||||
throw new Error('Missing data on selection type extension.');
|
||||
}
|
||||
var data = (typeof(this.data) === 'function') ? this.data() : this.data;
|
||||
|
||||
// The matchedValue could be the boolean value false
|
||||
var hasMatched = false;
|
||||
var matchedValue;
|
||||
var completions = [];
|
||||
data.forEach(function(option) {
|
||||
if (str == option) {
|
||||
matchedValue = this.fromString(option);
|
||||
hasMatched = true;
|
||||
}
|
||||
else if (option.indexOf(str) === 0) {
|
||||
completions.push(this.fromString(option));
|
||||
}
|
||||
}, this);
|
||||
|
||||
if (hasMatched) {
|
||||
return new Conversion(matchedValue);
|
||||
}
|
||||
else {
|
||||
// This is something of a hack. settings
|
||||
if (this.noMatch) {
|
||||
this.noMatch();
|
||||
}
|
||||
|
||||
if (completions.length > 0) {
|
||||
var msg = 'Possibilities' +
|
||||
(str.length === 0 ? '' : ' for \'' + str + '\'');
|
||||
return new Conversion(null, Status.INCOMPLETE, msg, completions);
|
||||
}
|
||||
else {
|
||||
var msg = 'Can\'t use \'' + str + '\'.';
|
||||
return new Conversion(null, Status.INVALID, msg, completions);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
SelectionType.prototype.fromString = function(str) {
|
||||
return str;
|
||||
};
|
||||
|
||||
SelectionType.prototype.decrement = function(value) {
|
||||
var data = (typeof this.data === 'function') ? this.data() : this.data;
|
||||
var index;
|
||||
if (value == null) {
|
||||
index = data.length - 1;
|
||||
}
|
||||
else {
|
||||
var name = this.stringify(value);
|
||||
var index = data.indexOf(name);
|
||||
index = (index === 0 ? data.length - 1 : index - 1);
|
||||
}
|
||||
return this.fromString(data[index]);
|
||||
};
|
||||
|
||||
SelectionType.prototype.increment = function(value) {
|
||||
var data = (typeof this.data === 'function') ? this.data() : this.data;
|
||||
var index;
|
||||
if (value == null) {
|
||||
index = 0;
|
||||
}
|
||||
else {
|
||||
var name = this.stringify(value);
|
||||
var index = data.indexOf(name);
|
||||
index = (index === data.length - 1 ? 0 : index + 1);
|
||||
}
|
||||
return this.fromString(data[index]);
|
||||
};
|
||||
|
||||
SelectionType.prototype.name = 'selection';
|
||||
|
||||
/**
|
||||
* SelectionType is a base class for other types
|
||||
*/
|
||||
exports.SelectionType = SelectionType;
|
||||
|
||||
/**
|
||||
* true/false values
|
||||
*/
|
||||
var bool = new SelectionType({
|
||||
name: 'bool',
|
||||
data: [ 'true', 'false' ],
|
||||
stringify: function(value) {
|
||||
return '' + value;
|
||||
},
|
||||
fromString: function(str) {
|
||||
return str === 'true' ? true : false;
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
* One of a known set of options
|
||||
*/
|
||||
function DeferredType(typeSpec) {
|
||||
if (typeof typeSpec.defer !== 'function') {
|
||||
throw new Error('Instances of DeferredType need typeSpec.defer to be a function that returns a type');
|
||||
}
|
||||
Object.keys(typeSpec).forEach(function(key) {
|
||||
this[key] = typeSpec[key];
|
||||
}, this);
|
||||
};
|
||||
|
||||
DeferredType.prototype = new Type();
|
||||
|
||||
DeferredType.prototype.stringify = function(value) {
|
||||
return this.defer().stringify(value);
|
||||
};
|
||||
|
||||
DeferredType.prototype.parse = function(value) {
|
||||
return this.defer().parse(value);
|
||||
};
|
||||
|
||||
DeferredType.prototype.decrement = function(value) {
|
||||
var deferred = this.defer();
|
||||
return (deferred.decrement ? deferred.decrement(value) : undefined);
|
||||
};
|
||||
|
||||
DeferredType.prototype.increment = function(value) {
|
||||
var deferred = this.defer();
|
||||
return (deferred.increment ? deferred.increment(value) : undefined);
|
||||
};
|
||||
|
||||
DeferredType.prototype.name = 'deferred';
|
||||
|
||||
/**
|
||||
* DeferredType is a base class for other types
|
||||
*/
|
||||
exports.DeferredType = DeferredType;
|
||||
|
||||
/**
|
||||
* Registration and de-registration.
|
||||
*/
|
||||
exports.startup = function() {
|
||||
types.registerType(text);
|
||||
types.registerType(number);
|
||||
types.registerType(bool);
|
||||
types.registerType(SelectionType);
|
||||
types.registerType(DeferredType);
|
||||
};
|
||||
|
||||
exports.shutdown = function() {
|
||||
types.unregisterType(text);
|
||||
types.unregisterType(number);
|
||||
types.unregisterType(bool);
|
||||
types.unregisterType(SelectionType);
|
||||
types.unregisterType(DeferredType);
|
||||
};
|
||||
|
||||
|
||||
});
|
||||
75
plugins/pilot/types/command.js
Normal file
75
plugins/pilot/types/command.js
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mozilla Skywriter.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Mozilla.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2009
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Joe Walker (jwalker@mozilla.com)
|
||||
* Kevin Dangoor (kdangoor@mozilla.com)
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var canon = require("pilot/canon");
|
||||
var SelectionType = require("pilot/types/basic").SelectionType;
|
||||
var types = require("pilot/types");
|
||||
|
||||
|
||||
/**
|
||||
* Select from the available commands
|
||||
*/
|
||||
var command = new SelectionType({
|
||||
name: 'command',
|
||||
data: function() {
|
||||
return canon.getCommandNames();
|
||||
},
|
||||
stringify: function(command) {
|
||||
return command.name;
|
||||
},
|
||||
fromString: function(str) {
|
||||
return canon.getCommand(str);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
/**
|
||||
* Registration and de-registration.
|
||||
*/
|
||||
exports.startup = function() {
|
||||
types.registerType(command);
|
||||
};
|
||||
|
||||
exports.shutdown = function() {
|
||||
types.unregisterType(command);
|
||||
};
|
||||
|
||||
|
||||
});
|
||||
109
plugins/pilot/types/settings.js
Normal file
109
plugins/pilot/types/settings.js
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
/* ***** BEGIN LICENSE BLOCK *****
|
||||
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
*
|
||||
* The contents of this file are subject to the Mozilla Public License Version
|
||||
* 1.1 (the "License"); you may not use this file except in compliance with
|
||||
* the License. You may obtain a copy of the License at
|
||||
* http://www.mozilla.org/MPL/
|
||||
*
|
||||
* Software distributed under the License is distributed on an "AS IS" basis,
|
||||
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
* for the specific language governing rights and limitations under the
|
||||
* License.
|
||||
*
|
||||
* The Original Code is Mozilla Skywriter.
|
||||
*
|
||||
* The Initial Developer of the Original Code is
|
||||
* Mozilla.
|
||||
* Portions created by the Initial Developer are Copyright (C) 2009
|
||||
* the Initial Developer. All Rights Reserved.
|
||||
*
|
||||
* Contributor(s):
|
||||
* Joe Walker (jwalker@mozilla.com)
|
||||
* Kevin Dangoor (kdangoor@mozilla.com)
|
||||
*
|
||||
* Alternatively, the contents of this file may be used under the terms of
|
||||
* either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
* in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
* of those above. If you wish to allow use of your version of this file only
|
||||
* under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
* use your version of this file under the terms of the MPL, indicate your
|
||||
* decision by deleting the provisions above and replace them with the notice
|
||||
* and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
* the provisions above, a recipient may use your version of this file under
|
||||
* the terms of any one of the MPL, the GPL or the LGPL.
|
||||
*
|
||||
* ***** END LICENSE BLOCK ***** */
|
||||
|
||||
define(function(require, exports, module) {
|
||||
|
||||
var SelectionType = require('pilot/types/basic').SelectionType;
|
||||
var DeferredType = require('pilot/types/basic').DeferredType;
|
||||
var types = require('pilot/types');
|
||||
var settings = require('pilot/settings').settings;
|
||||
|
||||
|
||||
/**
|
||||
* EVIL: This relies on us using settingValue in the same event as setting
|
||||
* The alternative is to have some central place where we store the current
|
||||
* command line, but this might be a lesser evil for now.
|
||||
*/
|
||||
var lastSetting;
|
||||
|
||||
/**
|
||||
* Select from the available settings
|
||||
*/
|
||||
var setting = new SelectionType({
|
||||
name: 'setting',
|
||||
data: function() {
|
||||
return env.settings.getSettingNames();
|
||||
},
|
||||
stringify: function(setting) {
|
||||
lastSetting = setting;
|
||||
return setting.name;
|
||||
},
|
||||
fromString: function(str) {
|
||||
lastSetting = settings.getSetting(str);
|
||||
return lastSetting;
|
||||
},
|
||||
noMatch: function() {
|
||||
lastSetting = null;
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* Something of a hack to allow the set command to give a clearer definition
|
||||
* of the type to the command line.
|
||||
*/
|
||||
var settingValue = new DeferredType({
|
||||
name: 'settingValue',
|
||||
defer: function() {
|
||||
if (lastSetting) {
|
||||
return lastSetting.type;
|
||||
}
|
||||
else {
|
||||
return types.getType('text');
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
var env;
|
||||
|
||||
/**
|
||||
* Registration and de-registration.
|
||||
*/
|
||||
exports.startup = function(data, reason) {
|
||||
// TODO: this is probably all kinds of evil, but we need something working
|
||||
env = data.env;
|
||||
types.registerType(setting);
|
||||
types.registerType(settingValue);
|
||||
};
|
||||
|
||||
exports.shutdown = function(data, reason) {
|
||||
types.unregisterType(setting);
|
||||
types.unregisterType(settingValue);
|
||||
};
|
||||
|
||||
|
||||
});
|
||||
Loading…
Add table
Add a link
Reference in a new issue