arg/scriptcraft
Archived
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed problems with AutoComplete

Browse source
This commit is contained in:
walterhiggins 2013-04-07 20:09:04 +01:00
parent 3d92e2c685
commit 244e1af270
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/javascript/core/_scriptcraft.js
View file

@ -556,15 +556,19 @@ var server = org.bukkit.Bukkit.server;
var _globalSymbols = _getProperties(global) var _globalSymbols = _getProperties(global)
var result = global.__onTC_result; var result = global.__onTC_result;
var args = global.__onTC_args; var args = global.__onTC_args;
var lastArg = args.length?args[args.length-1]+"":null;
var propsOfLastArg = []; var propsOfLastArg = [];
var statement = args.join(" "); var statement = args.join(" ");
statement = statement.replace(/^\s+/,"").replace(/\s+$/,""); statement = statement.replace(/^\s+/,"").replace(/\s+$/,"");
if (statement.length == 0) if (statement.length == 0)
propsOfLastArg = _globalSymbols; propsOfLastArg = _globalSymbols;
else{ else{
var statementSyms = statement.split(/[^\$a-zA-Z0-9_\.]/); var statementSyms = statement.split(/[^\$a-zA-Z0-9_\.]/);
var lastSymbol = statementSyms[statementSyms.length-1]; var lastSymbol = statementSyms[statementSyms.length-1];
//print("DEBUG: lastSymbol=[" + lastSymbol + "]");
// //
// try to complete the object ala java IDEs. // try to complete the object ala java IDEs.
// //
@ -594,7 +598,8 @@ var server = org.bukkit.Bukkit.server;
for (var i =0;i < objectProps.length;i++){ for (var i =0;i < objectProps.length;i++){
var candidate = lastSymbol + objectProps[i]; var candidate = lastSymbol + objectProps[i];
propsOfLastArg.push(candidate); var re = new RegExp(lastSymbol + "$","g");
propsOfLastArg.push(lastArg.replace(re,candidate));
} }
}else{ }else{
@ -604,14 +609,14 @@ var server = org.bukkit.Bukkit.server;
//print("debug:case Y: ScriptCraft.co"); //print("debug:case Y: ScriptCraft.co");
var li = statement.lastIndexOf(name); var li = statement.lastIndexOf(name);
statement = statement.substring(0,li);
for (var i = 0; i < objectProps.length;i++){ for (var i = 0; i < objectProps.length;i++){
if (objectProps[i].indexOf(name) == 0) if (objectProps[i].indexOf(name) == 0)
{ {
var candidate = lastSymbol.substring(0,lastSymbol.lastIndexOf(name)); var candidate = lastSymbol.substring(0,lastSymbol.lastIndexOf(name));
candidate = candidate + objectProps[i]; candidate = candidate + objectProps[i];
propsOfLastArg.push(candidate); var re = new RegExp(lastSymbol+ "$","g");
//print("DEBUG: re=" + re + ",lastSymbol="+lastSymbol+",lastArg=" + lastArg + ",candidate=" + candidate);
propsOfLastArg.push(lastArg.replace(re,candidate));
} }
} }
@ -620,7 +625,8 @@ var server = org.bukkit.Bukkit.server;
//print("debug:case Z:ScriptCraft"); //print("debug:case Z:ScriptCraft");
var objectProps = _getProperties(symbol); var objectProps = _getProperties(symbol);
for (var i = 0; i < objectProps.length; i++){ for (var i = 0; i < objectProps.length; i++){
propsOfLastArg.push(lastSymbol + "." + objectProps[i]); var re = new RegExp(lastSymbol+ "$","g");
propsOfLastArg.push(lastArg.replace(re,lastSymbol + "." + objectProps[i]));
} }
} }
}else{ }else{
@ -629,7 +635,8 @@ var server = org.bukkit.Bukkit.server;
for (var i = 0;i < _globalSymbols.length; i++){ for (var i = 0;i < _globalSymbols.length; i++){
if (_globalSymbols[i].indexOf(lastSymbol) == 0){ if (_globalSymbols[i].indexOf(lastSymbol) == 0){
var possibleCompletion = _globalSymbols[i]; var possibleCompletion = _globalSymbols[i];
propsOfLastArg.push(possibleCompletion); var re = new RegExp(lastSymbol+ "$","g");
propsOfLastArg.push(lastArg.replace(re,possibleCompletion));
} }
} }