#!/usr/bin/env ruby
Dir.glob('**/*.cpp') { |file|
# skip ast (excluding paste, astpath, and canv'ast'imer)
next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
s = File.read(file)
next if s.include?('qlalr')
orig = s.dup
s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
res = $&
if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
res
else
res.gsub!('} else', 'else')
res.gsub!(/\n +} *\n/m, "\n")
res.gsub(/ *{$/, '')
end
}
s.gsub!(/ *$/, '')
File.open(file, 'wb').write(s) if s != orig
}
Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
The '[' and ']' characters were considered block-opening/closing. That
led to bad results in the autocompleter (the only user of these
functions).
Task-number: QTCREATORBUG-8031
Change-Id: I81b464b2591d3695baad6e9630f9bcc4aa4ef795
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
This also allows simple setting of breakpoints on failed asserts.
Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
It was already broken in 2.4.
Task-number: QTCREATORBUG-7110
Change-Id: I24fae889c67ba5436548b7534d7257b6680a8c81
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
The breakpoints are deleted in some cases on updateLineNumber, thus we
can't call anything on the mark after calling updateLineNumber
Change-Id: Ib6c7bddc980fc72e9d4f4b9ec9e2eeb8292c1e15
Reviewed-by: hjk <qthjk@ovi.com>
Ensure that it is updated as the lines are moved. That can be later used
to quickly find and remove the marks again.
Change-Id: I2285111996d5c8ef12f792fd73ff00ce186addc1
Reviewed-by: hjk <qthjk@ovi.com>
This is a Eclipse-like feature, for select enclosing element.
e.g.
int test() {| // Here is the cursor position
...
}
When Double-click, we can select the block: {...}
I think this is a useful feature.
Change-Id: I4ca7ed04056176195d1622714effda9079ae0e44
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
When folding indents change and a block becomes no longer
folded we need to update the user data. This patch tries
to handle general inconsistencies that might arise in such
situations. Notice however that there are stil other problems
to be addressed (including issues in Qt).
Task-number: QTCREATORBUG-5771
Change-Id: I38b869832159598d46cde00058308c218ca31f1a
Reviewed-on: http://codereview.qt.nokia.com/2908
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Matthias Ettrich
The lexer needs its own lexerState, before it was using
the syntax highlighter user state. This breaks the brace
depth calculation of the highlighter.
Reviewed-by: Roberto Raggi
See BaseTextEditor::setRefactorMarkers(...). The markers support
a clicked signal via BaseTextEditor and tooltips. They feature
a cursor, but are always positioned at the end of the line (not block!).
As special gimmick they do extend the document width when they
are positioned outside the document area.
The new and cleaner foldingIndent in the block user data will
make it easier to support other kinds of indentation for various
other programming languages (like Python).
The Parentheses, TextBlockUserData and TextEditDocumentLayout classes
and their member function implementations were spread around the
BaseTextEditor class. Moving them to their own file to make the code a
bit better organized.
Reviewed-by: mae
