ui: show annotation in code snippets for TokenLocations that wrap around the snippet

bug id = #12
This commit is contained in:
Eberhard Graether
2014-07-28 03:27:16 +02:00
parent ecd17c17a0
commit 182e18840e
8 changed files with 37 additions and 18 deletions
+1 -1
View File
@@ -36,7 +36,7 @@ const std::string& QtCodeFile::getFileName() const
}
void QtCodeFile::addCodeSnippet(
int startLineNumber,
uint startLineNumber,
const std::string& code,
const TokenLocationFile& locationFile,
const std::vector<Id>& activeTokenIds
+1 -1
View File
@@ -21,7 +21,7 @@ public:
const std::string& getFileName() const;
void addCodeSnippet(
int startLineNumber,
uint startLineNumber,
const std::string& code,
const TokenLocationFile& locationFile,
const std::vector<Id>& activeTokenIds
+1 -1
View File
@@ -29,7 +29,7 @@ QtCodeFileList::~QtCodeFileList()
}
void QtCodeFileList::addCodeSnippet(
int startLineNumber,
uint startLineNumber,
const std::string& code,
const TokenLocationFile& locationFile,
const std::vector<Id>& activeTokenIds
+1 -1
View File
@@ -21,7 +21,7 @@ public:
virtual ~QtCodeFileList();
void addCodeSnippet(
int startLineNumber,
uint startLineNumber,
const std::string& code,
const TokenLocationFile& locationFile,
const std::vector<Id>& activeTokenIds
+3 -3
View File
@@ -35,7 +35,7 @@ void QtCodeSnippet::LineNumberArea::paintEvent(QPaintEvent *event)
QtCodeSnippet::QtCodeSnippet(
int startLineNumber,
uint startLineNumber,
const std::string& code,
const TokenLocationFile& locationFile,
const std::vector<Id>& activeTokenIds,
@@ -133,7 +133,7 @@ void QtCodeSnippet::lineNumberAreaPaintEvent(QPaintEvent *event)
int QtCodeSnippet::lineNumberDigits() const
{
int digits = 1;
int max = qMax(1, m_startLineNumber + blockCount());
int max = qMax(1, int(m_startLineNumber) + blockCount());
while (max >= 10)
{
@@ -272,7 +272,7 @@ void QtCodeSnippet::createAnnotations(const TokenLocationFile& locationFile)
}
Annotation annotation;
if (location->isStartTokenLocation())
if (location->isStartTokenLocation() && location->getLineNumber() >= m_startLineNumber)
{
annotation.start = toTextEditPosition(location->getLineNumber(), location->getColumnNumber() - 1);
}
+2 -2
View File
@@ -36,7 +36,7 @@ public:
};
QtCodeSnippet(
int startLineNumber,
uint startLineNumber,
const std::string& code,
const TokenLocationFile& locationFile,
const std::vector<Id>& activeTokenIds,
@@ -90,7 +90,7 @@ private:
QPushButton* m_maximizeButton;
bool m_showMaximizeButton;
const int m_startLineNumber;
const uint m_startLineNumber;
const std::string m_filePath;
std::vector<Id> m_activeTokenIds;