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

Introduced T_CPP_COMMENT and T_CPP_DOXY_COMMENT to handle C++-style comments and improved CPPEditor::isInComment to handle the newly introduced tokens.

Browse Source 
As side effect,this change should fix the regression we introduced in the "automagically" quote/brace insertion.
This commit is contained in:
Roberto Raggi
2009-09-29 11:34:11 +02:00
parent 1ce92c0ed6
commit e40cd82f8c
6 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/cppeditor/cppeditor.cpp
View File

@@ -1543,7 +1543,16 @@ bool CPPEditor::isInComment(const QTextCursor &cursor) const
const SimpleToken tk = tokenUnderCursor(cursor);
if (tk.isComment()) {
const int pos = cursor.selectionEnd();
const int pos = cursor.selectionEnd() - cursor.block().position();
if (pos == tk.end()) {
if (tk.is(T_CPP_COMMENT) || tk.is(T_CPP_DOXY_COMMENT))
return true;
const int state = cursor.block().userState() & 0xFF;
if (state > 0)
return true;
}
if (pos < tk.end())
return true;