This is an archive of the discontinued LLVM Phabricator instance.

Differential D70518

[clang-include-fixer] Suppress cmd prompt from Vim on Windows
ClosedPublic

Authored by rnk on Nov 20 2019, 4:42 PM.

Details

Reviewers
bkramer
sammccall
Commits
rGe1e7b6f381a9: [clang-include-fixer] Suppress cmd prompt from Vim on Windows
Summary

Copied from the clang-format.py editor integration.

Diff Detail

Event Timeline

rnk created this revision.Nov 20 2019, 4:42 PM
Herald added a project: Restricted Project. · View Herald TranscriptNov 20 2019, 4:42 PM
Harbormaster completed remote builds in B41277: Diff 230351.Nov 20 2019, 4:43 PM
bkramer accepted this revision.Nov 21 2019, 5:17 AM

lg

This revision is now accepted and ready to land.Nov 21 2019, 5:17 AM
Closed by commit rGe1e7b6f381a9: [clang-include-fixer] Suppress cmd prompt from Vim on Windows (authored by rnk). · Explain WhyNov 22 2019, 11:30 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
clang-tools-extra/
clang-include-fixer/
tool/
9 lines

Diff 230351

clang-tools-extra/clang-include-fixer/tool/clang-include-fixer.py

Show First 20 Lines • Show All 79 Lines • ▼ Show 20 Lines except Exception:
# Show a new prompt on invalid option instead of aborting so that users # Show a new prompt on invalid option instead of aborting so that users
# don't need to wait for another clang-include-fixer run. # don't need to wait for another clang-include-fixer run.
print >> sys.stderr, "Invalid option:", res print >> sys.stderr, "Invalid option:", res
return GetUserSelection(message, headers, maximum_suggested_headers) return GetUserSelection(message, headers, maximum_suggested_headers)
return headers[idx - 1] return headers[idx - 1]
def execute(command, text): def execute(command, text):
# Avoid flashing a cmd prompt on Windows.
startupinfo = None
if sys.platform.startswith('win32'):
startupinfo = subprocess.STARTUPINFO()
startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
startupinfo.wShowWindow = subprocess.SW_HIDE
p = subprocess.Popen(command, p = subprocess.Popen(command,
stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
stdin=subprocess.PIPE) stdin=subprocess.PIPE, startupinfo=startupinfo)
return p.communicate(input=text) return p.communicate(input=text)
def InsertHeaderToVimBuffer(header, text): def InsertHeaderToVimBuffer(header, text):
command = [binary, "-stdin", "-insert-header=" + json.dumps(header), command = [binary, "-stdin", "-insert-header=" + json.dumps(header),
vim.current.buffer.name] vim.current.buffer.name]
stdout, stderr = execute(command, text) stdout, stderr = execute(command, text)
if stderr: if stderr:
▲ Show 20 Lines • Show All 112 Lines • Show Last 20 Lines