intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-17 06:40:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

[lldb][NFC] Remove CompletionRequest::GetCursorArgument and GetRawLineUntilCursor

Browse Source 
They both return the same result as another function (GetCursorArgumentPrefix
and GetRawLine). They were only added because the old API allowed to look
(in theory) behind the cursor position which is no longer possible.

llvm-svn: 372861
This commit is contained in:
Raphael Isemann
2019-09-25 12:55:30 +00:00
parent c00627f4dc
commit 7f9ac3372c
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lldb/include/lldb/Utility/CompletionRequest.h
View File

@@ -103,9 +103,6 @@ public:
CompletionResult &result);
llvm::StringRef GetRawLine() const { return m_command; }
llvm::StringRef GetRawLineUntilCursor() const {
return m_command.substr(0, m_cursor_index);
}
unsigned GetRawCursorPos() const { return m_raw_cursor_pos; }
@@ -192,12 +189,8 @@ public:
descriptions.GetStringAtIndex(i));
}
llvm::StringRef GetCursorArgument() const {
return GetParsedLine().GetArgumentAtIndex(GetCursorIndex());
}
llvm::StringRef GetCursorArgumentPrefix() const {
return GetCursorArgument().substr(0, m_cursor_char_position);
return GetParsedLine().GetArgumentAtIndex(GetCursorIndex());
}
private:

4
lldb/source/Expression/REPL.cpp
View File

@@ -453,7 +453,7 @@ void REPL::IOHandlerComplete(IOHandler &io_handler,
}
// Strip spaces from the line and see if we had only spaces
if (request.GetRawLineUntilCursor().trim().empty()) {
if (request.GetRawLine().trim().empty()) {
// Only spaces on this line, so just indent
request.AddCompletion(m_indent_str);
return;
@@ -479,7 +479,7 @@ void REPL::IOHandlerComplete(IOHandler &io_handler,
}
current_code.append("\n");
current_code += request.GetRawLineUntilCursor();
current_code += request.GetRawLine();
StringList matches;
int result = CompleteCode(current_code, matches);

2
lldb/source/Interpreter/Options.cpp
View File

@@ -698,7 +698,7 @@ bool Options::HandleOptionCompletion(CompletionRequest &request,
request.AddCompletion("--" + long_option.str(), opt.usage_text);
return true;
} else
request.AddCompletion(request.GetCursorArgument());
request.AddCompletion(request.GetCursorArgumentPrefix());
return true;
} else {
// FIXME - not handling wrong options yet: