gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 18:57:59 +01:00
Code Issues Projects Releases Wiki Activity

Fix numeric properties appearing in object. completion (apparantly \w includes digits)

Browse Source
This commit is contained in:
Kris Maglione
2008-12-08 13:53:09 -05:00
parent 21e2219819
commit 5c62ebbcbc
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/completion.js
View File

@@ -753,20 +753,20 @@ function Completion() //{{{
{
// A word character following a non-word character, or simply a non-word
// character. Start a new statement.
if (/[\w$]/.test(c) && !/[\w\d$]/.test(lastChar) || !/[\w\d\s$]/.test(c))
if (/[a-zA-Z_$]/.test(c) && !/[\w$]/.test(lastChar) || !/[\w\s$]/.test(c))
top[STATEMENTS].push(i);
// A "." or a "[" dereferences the last "statement" and effectively
// joins it to this logical statement.
if ((c == "." || c == "[") && /[\w\d$\])"']/.test(lastNonwhite)
|| lastNonwhite == "." && /[\w$]/.test(c))
if ((c == "." || c == "[") && /[\w$\])"']/.test(lastNonwhite)
|| lastNonwhite == "." && /[a-zA-Z_$]/.test(c))
top[STATEMENTS].pop();
switch (c)
{
case "(":
/* Function call, or if/while/for/... */
if (/[\w\d$]/.test(lastNonwhite))
if (/[\w$]/.test(lastNonwhite))
{
functions.push(i);
top[FUNCTIONS].push(i);
@@ -800,7 +800,7 @@ function Completion() //{{{
}
this.popStatement = false;
if (!/[\w\d$]/.test(lastChar) && lastNonwhite != ".")
if (!/[\w$]/.test(lastChar) && lastNonwhite != ".")
{
this.popStatement = true;
top[STATEMENTS].push(i);
@@ -918,7 +918,7 @@ function Completion() //{{{
if (last != null)
context.quote = [last, function (text) util.escapeString(text.substr(offset), ""), last];
else // We're not looking for a quoted string, so filter out anything that's not a valid identifier
context.filters.push(function (item) /^[\w$][\w\d$]*$/.test(item.text));
context.filters.push(function (item) /^[a-zA-Z_$][\w$]*$/.test(item.text));
compl.call(self, context, obj);
}
@@ -1086,7 +1086,7 @@ function Completion() //{{{
return;
}
if (!/^(?:\w[\w\d]*)?$/.test(key))
if (!/^(?:[a-zA-Z_$][\w$]*)?$/.test(key))
return; /* Not a word. Forget it. Can this even happen? */
try