feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

TextEditor: more FileName -> FilePath renaming

Browse Source 
Change-Id: Ia61868806db47561e7bf7ae9b3cfb1e62a085a7a
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2019-10-01 09:11:02 +02:00
parent d3b4f06ada
commit 9afc5305d6
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/languageclient/client.cpp
View File

@@ -140,7 +140,7 @@ Client::~Client()
for (const DocumentUri &uri : m_diagnostics.keys()) for (const DocumentUri &uri : m_diagnostics.keys())
removeDiagnostics(uri); removeDiagnostics(uri);
for (const DocumentUri &uri : m_highlights.keys()) { for (const DocumentUri &uri : m_highlights.keys()) {
if (TextDocument *doc = TextDocument::textDocumentForFileName(uri.toFilePath())) { if (TextDocument *doc = TextDocument::textDocumentForFilePath(uri.toFilePath())) {
if (TextEditor::SyntaxHighlighter *highlighter = doc->syntaxHighlighter()) if (TextEditor::SyntaxHighlighter *highlighter = doc->syntaxHighlighter())
highlighter->clearAllExtraFormats(); highlighter->clearAllExtraFormats();
} }
@@ -620,7 +620,7 @@ void Client::cursorPositionChanged(TextEditor::TextEditorWidget *widget)
void Client::requestCodeActions(const DocumentUri &uri, const QList<Diagnostic> &diagnostics) void Client::requestCodeActions(const DocumentUri &uri, const QList<Diagnostic> &diagnostics)
{ {
const Utils::FilePath fileName = uri.toFilePath(); const Utils::FilePath fileName = uri.toFilePath();
TextEditor::TextDocument *doc = TextEditor::TextDocument::textDocumentForFileName(fileName); TextEditor::TextDocument *doc = TextEditor::TextDocument::textDocumentForFilePath(fileName);
if (!doc) if (!doc)
return; return;
@@ -918,7 +918,7 @@ void Client::showMessageBox(const ShowMessageRequestParams &message, const Messa
void Client::showDiagnostics(const DocumentUri &uri) void Client::showDiagnostics(const DocumentUri &uri)
{ {
if (TextEditor::TextDocument *doc if (TextEditor::TextDocument *doc
= TextEditor::TextDocument::textDocumentForFileName(uri.toFilePath())) { = TextEditor::TextDocument::textDocumentForFilePath(uri.toFilePath())) {
for (TextMark *mark : m_diagnostics.value(uri)) for (TextMark *mark : m_diagnostics.value(uri))
doc->addMark(mark); doc->addMark(mark);
} }
@@ -927,7 +927,7 @@ void Client::showDiagnostics(const DocumentUri &uri)
void Client::removeDiagnostics(const DocumentUri &uri) void Client::removeDiagnostics(const DocumentUri &uri)
{ {
TextEditor::TextDocument *doc TextEditor::TextDocument *doc
= TextEditor::TextDocument::textDocumentForFileName(uri.toFilePath()); = TextEditor::TextDocument::textDocumentForFilePath(uri.toFilePath());
for (TextMark *mark : m_diagnostics.take(uri)) { for (TextMark *mark : m_diagnostics.take(uri)) {
if (doc) if (doc)
@@ -1052,7 +1052,7 @@ void Client::handleDiagnostics(const PublishDiagnosticsParams &params)
// TextMarks are already added in the TextEditor::TextMark constructor // TextMarks are already added in the TextEditor::TextMark constructor
// so hide them if we are not the active client for this document // so hide them if we are not the active client for this document
if (LanguageClientManager::clientForUri(uri) != this) if (LanguageClientManager::clientForUri(uri) != this)
hideDiagnostics(TextEditor::TextDocument::textDocumentForFileName(uri.toFilePath())); hideDiagnostics(TextEditor::TextDocument::textDocumentForFilePath(uri.toFilePath()));
else else
requestCodeActions(uri, diagnostics); requestCodeActions(uri, diagnostics);
} }
@@ -1062,7 +1062,7 @@ void Client::handleSemanticHighlight(const SemanticHighlightingParams &params)
const DocumentUri &uri = params.textDocument().uri(); const DocumentUri &uri = params.textDocument().uri();
m_highlights[uri].clear(); m_highlights[uri].clear();
const LanguageClientValue<int> &version = params.textDocument().version(); const LanguageClientValue<int> &version = params.textDocument().version();
TextEditor::TextDocument *doc = TextEditor::TextDocument::textDocumentForFileName( TextEditor::TextDocument *doc = TextEditor::TextDocument::textDocumentForFilePath(
uri.toFilePath()); uri.toFilePath());
if (!doc || LanguageClientManager::clientForDocument(doc) != this if (!doc || LanguageClientManager::clientForDocument(doc) != this
@@ -1082,7 +1082,7 @@ void Client::rehighlight()
{ {
using namespace TextEditor; using namespace TextEditor;
for (auto it = m_highlights.begin(), end = m_highlights.end(); it != end; ++it) { for (auto it = m_highlights.begin(), end = m_highlights.end(); it != end; ++it) {
if (TextDocument *doc = TextDocument::textDocumentForFileName(it.key().toFilePath())) { if (TextDocument *doc = TextDocument::textDocumentForFilePath(it.key().toFilePath())) {
if (LanguageClientManager::clientForDocument(doc) == this) if (LanguageClientManager::clientForDocument(doc) == this)
SemanticHighligtingSupport::applyHighlight(doc, it.value(), capabilities()); SemanticHighligtingSupport::applyHighlight(doc, it.value(), capabilities());
} }

2
src/plugins/languageclient/languageclientmanager.cpp
View File

@@ -316,7 +316,7 @@ Client *LanguageClientManager::clientForDocument(TextEditor::TextDocument *docum
Client *LanguageClientManager::clientForFilePath(const Utils::FilePath &filePath) Client *LanguageClientManager::clientForFilePath(const Utils::FilePath &filePath)
{ {
return clientForDocument(TextEditor::TextDocument::textDocumentForFileName(filePath)); return clientForDocument(TextEditor::TextDocument::textDocumentForFilePath(filePath));
} }
Client *LanguageClientManager::clientForUri(const DocumentUri &uri) Client *LanguageClientManager::clientForUri(const DocumentUri &uri)

4
src/plugins/languageclient/languageclientutils.cpp
View File

@@ -80,7 +80,7 @@ bool applyTextDocumentEdit(const TextDocumentEdit &edit)
if (edits.isEmpty()) if (edits.isEmpty())
return true; return true;
const DocumentUri &uri = edit.id().uri(); const DocumentUri &uri = edit.id().uri();
if (TextDocument* doc = TextDocument::textDocumentForFileName(uri.toFilePath())) { if (TextDocument* doc = TextDocument::textDocumentForFilePath(uri.toFilePath())) {
LanguageClientValue<int> version = edit.id().version(); LanguageClientValue<int> version = edit.id().version();
if (!version.isNull() && version.value(0) < doc->document()->revision()) if (!version.isNull() && version.value(0) < doc->document()->revision())
return false; return false;
@@ -137,7 +137,7 @@ void updateCodeActionRefactoringMarker(Client *client,
const CodeAction &action, const CodeAction &action,
const DocumentUri &uri) const DocumentUri &uri)
{ {
TextDocument* doc = TextDocument::textDocumentForFileName(uri.toFilePath()); TextDocument* doc = TextDocument::textDocumentForFilePath(uri.toFilePath());
if (!doc) if (!doc)
return; return;
const QVector<BaseTextEditor *> editors = BaseTextEditor::textEditorsForDocument(doc); const QVector<BaseTextEditor *> editors = BaseTextEditor::textEditorsForDocument(doc);

4
src/plugins/texteditor/textdocument.cpp
View File

@@ -300,9 +300,9 @@ TextDocument *TextDocument::currentTextDocument()
return qobject_cast<TextDocument *>(EditorManager::currentDocument()); return qobject_cast<TextDocument *>(EditorManager::currentDocument());
} }
TextDocument *TextDocument::textDocumentForFileName(const Utils::FilePath &fileName) TextDocument *TextDocument::textDocumentForFilePath(const Utils::FilePath &filePath)
{ {
return qobject_cast<TextDocument *>(DocumentModel::documentForFilePath(fileName.toString())); return qobject_cast<TextDocument *>(DocumentModel::documentForFilePath(filePath.toString()));
} }
QString TextDocument::plainText() const QString TextDocument::plainText() const

2
src/plugins/texteditor/textdocument.h
View File

@@ -70,7 +70,7 @@ public:
static QMap<QString, QString> openedTextDocumentContents(); static QMap<QString, QString> openedTextDocumentContents();
static QMap<QString, QTextCodec *> openedTextDocumentEncodings(); static QMap<QString, QTextCodec *> openedTextDocumentEncodings();
static TextDocument *currentTextDocument(); static TextDocument *currentTextDocument();
static TextDocument *textDocumentForFileName(const Utils::FilePath &fileName); static TextDocument *textDocumentForFilePath(const Utils::FilePath &filePath);
virtual QString plainText() const; virtual QString plainText() const;
virtual QString textAt(int pos, int length) const; virtual QString textAt(int pos, int length) const;

2
src/plugins/texteditor/textmark.cpp
View File

@@ -364,7 +364,7 @@ TextMarkRegistry::TextMarkRegistry(QObject *parent)
void TextMarkRegistry::add(TextMark *mark) void TextMarkRegistry::add(TextMark *mark)
{ {
instance()->m_marks[mark->fileName()].insert(mark); instance()->m_marks[mark->fileName()].insert(mark);
if (TextDocument *document = TextDocument::textDocumentForFileName(mark->fileName())) if (TextDocument *document = TextDocument::textDocumentForFilePath(mark->fileName()))
document->addMark(mark); document->addMark(mark);
} }