forked from qt-creator/qt-creator
More Qt6 porting
Change-Id: I96bef1772149eb718e250563c65bf5da7259d9d6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -332,7 +332,7 @@ Utils::Text::Replacements utf16Replacements(const QTextDocument *doc,
|
|||||||
if (isInsideDummyTextInLine(lineText, bufferLineText, lineColUtf16.column))
|
if (isInsideDummyTextInLine(lineText, bufferLineText, lineColUtf16.column))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
lineColUtf16.column = std::min(lineColUtf16.column, lineText.length() + 1);
|
lineColUtf16.column = std::min(lineColUtf16.column, int(lineText.length()) + 1);
|
||||||
|
|
||||||
const int utf16Offset = Utils::Text::positionInText(doc,
|
const int utf16Offset = Utils::Text::positionInText(doc,
|
||||||
lineColUtf16.line,
|
lineColUtf16.line,
|
||||||
|
|||||||
@@ -30,6 +30,8 @@
|
|||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
#include <QMultiMap>
|
#include <QMultiMap>
|
||||||
#include <QMutex>
|
#include <QMutex>
|
||||||
|
#include <QSet>
|
||||||
|
#include <QUrl>
|
||||||
|
|
||||||
namespace Help {
|
namespace Help {
|
||||||
namespace Internal {
|
namespace Internal {
|
||||||
|
|||||||
@@ -28,8 +28,11 @@
|
|||||||
#include "utils/optional.h"
|
#include "utils/optional.h"
|
||||||
|
|
||||||
#include <languageserverprotocol/languagefeatures.h>
|
#include <languageserverprotocol/languagefeatures.h>
|
||||||
|
#include <languageserverprotocol/lsptypes.h>
|
||||||
|
|
||||||
|
#include <QMap>
|
||||||
#include <QObject>
|
#include <QObject>
|
||||||
|
#include <QSet>
|
||||||
#include <QTimer>
|
#include <QTimer>
|
||||||
|
|
||||||
namespace LanguageClient {
|
namespace LanguageClient {
|
||||||
|
|||||||
@@ -32,6 +32,8 @@
|
|||||||
#include <languageserverprotocol/languagefeatures.h>
|
#include <languageserverprotocol/languagefeatures.h>
|
||||||
#include <languageserverprotocol/workspace.h>
|
#include <languageserverprotocol/workspace.h>
|
||||||
|
|
||||||
|
#include <QVector>
|
||||||
|
|
||||||
namespace Core { class IEditor; }
|
namespace Core { class IEditor; }
|
||||||
|
|
||||||
namespace LanguageClient {
|
namespace LanguageClient {
|
||||||
|
|||||||
Reference in New Issue
Block a user