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

C++: Fix handling of Objective-C/C++

Browse Source 
- Objective C/C++ was not enabled in highlighter.
- QMake project part for Objective C/C++ did not have ObjectiveC extension enabled.
- As languageFeatures.objCEnabled is a bitfield, it was actually always set to 0.
- Highlight ObjC class & protocol declarations.
- Highlight ObjC message passing.

Change-Id: I64d12c9509058d05f7adce94598cb7ce91727ac8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
Francois Ferrand
2016-09-12 13:42:42 +02:00
parent 8f0ddff1cc
commit 38ae5aec10
7 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -872,7 +872,7 @@ AssistInterface *CppEditorWidget::createAssistInterface(AssistKind kind, AssistR
LanguageFeatures features = LanguageFeatures::defaultFeatures();
if (Document::Ptr doc = d->m_lastSemanticInfo.doc)
features = doc->languageFeatures();
features.objCEnabled = cppEditorDocument()->isObjCEnabled();
features.objCEnabled |= cppEditorDocument()->isObjCEnabled();
return cap->createAssistInterface(
textDocument()->filePath().toString(),
this,