Commit 6fe82385 authored by Tim Jenssen's avatar Tim Jenssen Committed by Tim Jenssen
Browse files

Revert "Clang: Inline LinePrefixer"

This reverts commit 3ea1eb36

.

not performance relevant

Change-Id: I3e0a4bdf2317c5eec858c7661b2e67fe8028aff5
Reviewed-by: Marco Bubke's avatarMarco Bubke <marco.bubke@qt.io>
Reviewed-by: default avatarhjk <hjk@qt.io>
parent 887ba526
...@@ -32,6 +32,7 @@ SOURCES += $$PWD/clangcodemodelserverinterface.cpp \ ...@@ -32,6 +32,7 @@ SOURCES += $$PWD/clangcodemodelserverinterface.cpp \
$$PWD/codecompletionchunk.cpp \ $$PWD/codecompletionchunk.cpp \
$$PWD/projectpartcontainer.cpp \ $$PWD/projectpartcontainer.cpp \
$$PWD/projectpartsdonotexistmessage.cpp \ $$PWD/projectpartsdonotexistmessage.cpp \
$$PWD/lineprefixer.cpp \
$$PWD/clangbackendipcdebugutils.cpp \ $$PWD/clangbackendipcdebugutils.cpp \
$$PWD/diagnosticcontainer.cpp \ $$PWD/diagnosticcontainer.cpp \
$$PWD/sourcerangecontainer.cpp \ $$PWD/sourcerangecontainer.cpp \
......
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "lineprefixer.h"
namespace ClangBackEnd {
LinePrefixer::LinePrefixer(const QByteArray &prefix)
: m_prefix(prefix)
, m_previousIsEndingWithNewLine(true)
{}
QByteArray LinePrefixer::prefix(const QByteArray &text)
{
QByteArray output = text;
if (m_previousIsEndingWithNewLine)
output.prepend(m_prefix);
if (output.endsWith('\n')) {
m_previousIsEndingWithNewLine = true;
output.chop(1);
} else {
m_previousIsEndingWithNewLine = false;
}
output.replace("\n", "\n" + m_prefix);
if (m_previousIsEndingWithNewLine)
output.append('\n');
return output;
}
} // namespace ClangBackEnd
...@@ -25,10 +25,9 @@ ...@@ -25,10 +25,9 @@
#pragma once #pragma once
#include <utf8string.h>
#include <QString> #include <QString>
#include <QTextStream> #include <QTextStream>
#include <utf8string.h>
namespace ClangBackEnd { namespace ClangBackEnd {
...@@ -36,36 +35,12 @@ class LinePrefixer ...@@ -36,36 +35,12 @@ class LinePrefixer
{ {
public: public:
LinePrefixer() = delete; LinePrefixer() = delete;
LinePrefixer(const QByteArray &prefix) LinePrefixer(const QByteArray &m_prefix);
: prefix_(prefix), QByteArray prefix(const QByteArray &text);
previousIsEndingWithNewLine(true)
{
}
QByteArray prefix(const QByteArray &text)
{
QByteArray output = text;
if (previousIsEndingWithNewLine)
output.prepend(prefix_);
if (output.endsWith('\n')) {
previousIsEndingWithNewLine = true;
output.chop(1);
} else {
previousIsEndingWithNewLine = false;
}
output.replace("\n", "\n" + prefix_);
if (previousIsEndingWithNewLine)
output.append('\n');
return output;
}
private: private:
QByteArray prefix_; QByteArray m_prefix;
bool previousIsEndingWithNewLine; bool m_previousIsEndingWithNewLine;
}; };
} // namespace ClangBackEnd } // namespace ClangBackEnd
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment