feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,741 Commits 108 Branches 368 Tags
f8ef0fac136d48e4ddc1df260bab4344ca812bc8
Commit Graph

50 Commits

Author SHA1 Message Date
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Christian Kamm
11fea7db5a C++ highlighter: Disable highlighting to the right of #error. 
Task-number: QTCREATORBUG-4098
Reviewed-by: Roberto Raggi
 2011-03-17 11:24:17 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Roberto Raggi
8acde74d79 Forked QSyntaxHighlighter from Qt 4.7. 
We need our very own syntax highlighter in Qt Creator.
 2010-07-09 14:47:18 +02:00
Erik Verbruggen
8e4fb678fd Removing SimpleToken 2010-07-02 11:18:51 +02:00
Bill King
21843d6326 Disambiguate the second logical test. 
The second line test could be misread by both the compiler or the reader.
gcc even warns about this, so add brackets just to make sure.
 2010-06-25 14:12:01 +10:00
Erik Verbruggen
e42ca194c5 Introduced token caching to prevent repetetive tokenizing. 
Also removed TokenUnderCursor as it's functionality is in the token cache.

Reviewed-by: ckamm
 2010-06-14 10:10:05 +02:00
Erik Verbruggen
424b9724d6 Revert "Introduced a token cache for the C++ editor." 
This reverts commit c2393df023.
 2010-06-04 12:37:26 +02:00
Erik Verbruggen
c2393df023 Introduced a token cache for the C++ editor. 
This should speed things up a bit, because before, the line was tokenized at
least 3 times.
 2010-06-04 09:36:05 +02:00
Roberto Raggi
829df11c9d Recognize Q_* and QT_* as reserved keywords. 2010-06-01 11:58:43 +02:00
Roberto Raggi
b68a16f1b5 Highlight user defined types. 2010-05-25 17:15:22 +02:00
mae
e07c34017e Rework code folding 
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).
 2010-05-20 15:11:31 +02:00
Thorbjørn Lindeijer
8e9a70addf Renamed TextEditDocumentLayout to BaseTextDocumentLayout 2010-04-26 14:42:11 +02:00
Thorbjørn Lindeijer
41ab8fbbf1 Moved TextEditDocumentLayout and related classes to their own file 
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
 2010-04-26 14:42:11 +02:00
Thorbjørn Lindeijer
759ff3b4ed Fixed typo highightLine -> highlightLine 2010-04-16 17:46:32 +02:00
Thorbjørn Lindeijer
55302393ce Don't highlight \ at end of line as whitespace 
It is not considered a token by the C++ tokenizer, and was hence
considered to be trailing whitespace. Use the highightLine method to
make sure that any non-whitespace characters in this "trailing
whitespace" are not highlighted as such.

Task-number: QTCREATORBUG-987
 2010-04-16 17:46:32 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Erik Verbruggen
8de6ccc775 Revert "Split Objective-C keyword parsing to handle the '@' separately." 
This reverts commit 2a59d2ae0c.
 2010-02-15 12:24:31 +01:00
Erik Verbruggen
2a59d2ae0c Split Objective-C keyword parsing to handle the '@' separately. 
Because apparently, while designing the Objective-C language, somebody
thought it was a world-class idea to allow any white-space between the
'@' character and the subsequent keyword. With this fix, we now
correctly parse:
    @  dynamic
and:
    @
      selector
and:
    @"foo"
     "bar"
    @"mooze"
(This last one is 1 single string split over multiple lines.)
Wonderful, isn't it?

What we (and Clang) do not support, but what GCC supports is something
like:
   @"foo"@@  "bar"  @"mooze"  @@
which is equivalent to @"foobarmooze".
 2010-02-15 09:27:00 +01:00
con
cf949a948c Merge commit 'origin/1.3' 2009-11-24 16:22:17 +01:00
Thorbjørn Lindeijer
6894cd0b2e Fixed a potential issue with automatic brace matching 
When encountering a line that hasn't been highlighted yet, we need to
abort the optimization for changing brace depth.

Done with Roberto Raggi and mae.
 2009-11-23 15:18:09 +01:00
Roberto Raggi
3f3a36b728 Turned off the syntax highlighter for objc keywords. 2009-11-11 16:46:33 +01:00
Erik Verbruggen
d61eb9c893 Syntax highlighting for Objective-C identifiers (super, self, nil, Nil, _cmd, SEL, IMP, BOOL, YES, NO, id). 2009-10-09 15:23:19 +02:00
Roberto Raggi
37a713bc6d Mark the white spaces in literals, comments and preprocessor directives with the visual space format. 2009-10-08 13:02:25 +02:00
mae
3a2974b3f9 some action cleanup for the qml editor 
done with Erik Verbruggen
 2009-10-01 13:34:02 +02:00
Roberto Raggi
e40cd82f8c Introduced T_CPP_COMMENT and T_CPP_DOXY_COMMENT to handle C++-style comments and improved CPPEditor::isInComment to handle the newly introduced tokens. 
As side effect,this change should fix the regression we introduced in the "automagically" quote/brace insertion.
 2009-09-29 11:35:43 +02:00
mae
36fb96b69d fix auto braces with preprocessor directives 
We now exclude brace in ifdefed out sections when calculating,
whether or not the braces match. This requires adjust the brace
levels whenever sections get ifdef'd out or ifdef'd in again.
 2009-09-25 17:23:14 +02:00
Thorbjørn Lindeijer
d11af4511b Fixed brace depth level to allow negative numbers 
Done with mae.
 2009-09-16 16:16:45 +02:00
mae
32229e30b4 mark all-whitespace-lines with the correct visual format. 2009-09-09 14:58:47 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Roberto Raggi
1eefd16383 Fixed a few typos and bugs in the ObjC++ support. 2009-07-13 12:05:29 +02:00
Roberto Raggi
3e54a65a69 Replaced T_INT_LITERAL and T_FLOAT_LITERAL with T_NUMERIC_LITERAL. 2009-07-10 15:45:09 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
mae
7d936a398c make insertion of braces a bit faster, by saving some of the rehighlighting work 2009-05-06 16:48:51 +02:00
Roberto Raggi
38f4693d6f Fixed the highlighy of objc++ string literals. 2009-03-02 14:20:43 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Roberto Raggi
a976385b44 Code completion of doxygen tags. 2009-02-20 12:55:18 +01:00
Roberto Raggi
8002b1a94c Customizable doxy formats. 2009-02-20 12:08:34 +01:00
Roberto Raggi
5bf1f27e20 kill some warnings 2009-02-20 11:53:32 +01:00
Roberto Raggi
4c5ff047f0 Initial support for doxygen comments. 2009-02-20 11:52:27 +01:00
Roberto Raggi
bb095fadd2 Fixes: Highlighting of objc #import directive. 2009-02-05 14:30:25 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
dt
3ba192af7e Merge branch '0.9.1-beta' 2008-12-17 14:21:03 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
Thorbjørn Lindeijer
442737d6e3 Renamed CPPHighlighter to CppHighlighter 
Lowercase is the more prevalent style in this plugin and CppTools.
Unfortunately CPPEditor can't be named CppEditor cause of the CppEditor
namespace.
 2008-12-16 13:19:11 +01:00
hjk
df7aacd637 more file cosmetics 2008-12-02 15:08:31 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00