gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-06 22:14:12 +01:00
Code Issues Projects Releases Wiki Activity

Add named groups (a la Python) to util.regexp.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-12 12:25:46 -05:00
parent d6e22872d3
commit c3a90cf2b3
10 changed files with 68 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
common/modules/io.jsm
View File

@@ -929,22 +929,25 @@ unlet s:cpo_save
completion.addUrlCompleter("f", "Local files", function (context, full) {
let match = util.regexp(<![CDATA[
^
(
((chrome|resource):\/\/)
(?P<prefix>
(?P<proto>
(?P<scheme> chrome|resource)
:\/\/
)
[^\/]*
)
(\/[^\/]*)?
(?P<path> \/[^\/]* )?
$
]]>).exec(context.filter);
if (match) {
if (!match[4]) {
context.key = match[2];
context.advance(match[2].length);
context.generate = function () util.chromePackages.map(function (p) [p, match[2] + p + "/"]);
if (!match.path) {
context.key = match.proto;
context.advance(match.proto.length);
context.generate = function () util.chromePackages.map(function (p) [p, match.proto + p + "/"]);
}
else if (match[3] === "chrome") {
context.key = match[1];
context.advance(match[1].length + 1);
else if (match.scheme === "chrome") {
context.key = match.prefix;
context.advance(match.prefix.length + 1);
context.generate = function () iter({
content: "Chrome content",
locale: "Locale-specific content",
@@ -952,7 +955,7 @@ unlet s:cpo_save
});
}
}
if (!match || match[3] === "resource" && match[4])
if (!match || match.scheme === "resource" && match.path)
if (/^(\.{0,2}|~)\/|^file:/.test(context.filter) || util.getFile(context.filter) || io.isJarURL(context.filter))
completion.file(context, full);
});