forks
/
D-Scanner
mirror of https://github.com/dlang-community/D-Scanner.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If no file is specified for --dotComplete or --parenComplete, read from stdin instead

This commit is contained in:
John Maschmeyer 2012-10-16 18:54:11 -05:00
parent c25944e85e
commit 224349ac9c
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main.d
View File

@ -172,7 +172,27 @@ void main(string[] args)
importDirs ~= dirName(args[1]); importDirs ~= dirName(args[1]);
else else
importDirs ~= getcwd(); importDirs ~= getcwd();
auto tokens = args[1].readText().tokenize(); bool useStdin = false;
try
{
to!size_t(args[1]);
useStdin = true;
}
catch(ConvException e) {}
Token[] tokens;
if (useStdin)
{
string f;
char[] buf;
while (stdin.readln(buf))
f ~= buf;
tokens = f.tokenize();
}
else
{
tokens = args[1].readText().tokenize();
args.popFront();
}
auto mod = parseModule(tokens); auto mod = parseModule(tokens);
CompletionContext context = new CompletionContext(mod); CompletionContext context = new CompletionContext(mod);
context.importDirectories = importDirs; context.importDirectories = importDirs;
@ -185,9 +205,9 @@ void main(string[] args)
} }
auto complete = AutoComplete(tokens, context); auto complete = AutoComplete(tokens, context);
if (parenComplete) if (parenComplete)
writeln(complete.parenComplete(to!size_t(args[2]))); writeln(complete.parenComplete(to!size_t(args[1])));
else if (dotComplete) else if (dotComplete)
writeln(complete.dotComplete(to!size_t(args[2]))); writeln(complete.dotComplete(to!size_t(args[1])));
return; return;
} }