From 33a7952745571576fb955fd33bc96e86f0e456fd Mon Sep 17 00:00:00 2001 From: jkobus Date: Wed, 14 Aug 2013 13:52:13 +0200 Subject: Implement syntax highlighting in diff editor All Qt Creator's main highlighters are used in the first place, for other mimetypes generic highlighter is used as a fallback. Task-number: QTCREATORBUG-9580 Change-Id: I863b9085520e5bdda142ce88f2074afeacee0531 Reviewed-by: Orgad Shaneh Reviewed-by: Petar Perisin Reviewed-by: Jarek Kobus --- src/plugins/cppeditor/cppeditor.pro | 2 + src/plugins/cppeditor/cppeditor.qbs | 2 + src/plugins/cppeditor/cppeditorplugin.cpp | 2 + src/plugins/cppeditor/cpphighlighterfactory.cpp | 48 +++++++++++++++++++++++ src/plugins/cppeditor/cpphighlighterfactory.h | 51 +++++++++++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 src/plugins/cppeditor/cpphighlighterfactory.cpp create mode 100644 src/plugins/cppeditor/cpphighlighterfactory.h (limited to 'src/plugins/cppeditor') diff --git a/src/plugins/cppeditor/cppeditor.pro b/src/plugins/cppeditor/cppeditor.pro index d646ca23b1..d715c81e16 100644 --- a/src/plugins/cppeditor/cppeditor.pro +++ b/src/plugins/cppeditor/cppeditor.pro @@ -11,6 +11,7 @@ HEADERS += cppeditorplugin.h \ cppfilewizard.h \ cppfunctiondecldeflink.h \ cpphighlighter.h \ + cpphighlighterfactory.h \ cpphoverhandler.h \ cppoutline.h \ cppquickfixassistant.h \ @@ -27,6 +28,7 @@ SOURCES += cppeditorplugin.cpp \ cppfilewizard.cpp \ cppfunctiondecldeflink.cpp \ cpphighlighter.cpp \ + cpphighlighterfactory.cpp \ cpphoverhandler.cpp \ cppoutline.cpp \ cppquickfixassistant.cpp \ diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index 39533511cd..96e685b128 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -37,6 +37,8 @@ QtcPlugin { "cppfunctiondecldeflink.h", "cpphighlighter.cpp", "cpphighlighter.h", + "cpphighlighterfactory.cpp", + "cpphighlighterfactory.h", "cpphoverhandler.cpp", "cpphoverhandler.h", "cppoutline.cpp", diff --git a/src/plugins/cppeditor/cppeditorplugin.cpp b/src/plugins/cppeditor/cppeditorplugin.cpp index 8df51752aa..13e0bfb93c 100644 --- a/src/plugins/cppeditor/cppeditorplugin.cpp +++ b/src/plugins/cppeditor/cppeditorplugin.cpp @@ -39,6 +39,7 @@ #include "cppsnippetprovider.h" #include "cppquickfixassistant.h" #include "cppquickfixes.h" +#include "cpphighlighterfactory.h" #include #include @@ -160,6 +161,7 @@ bool CppEditorPlugin::initialize(const QStringList & /*arguments*/, QString *err addAutoReleasedObject(new CppOutlineWidgetFactory); addAutoReleasedObject(new CppTypeHierarchyFactory); addAutoReleasedObject(new CppSnippetProvider); + addAutoReleasedObject(new CppHighlighterFactory); m_quickFixProvider = new CppQuickFixAssistProvider; addAutoReleasedObject(m_quickFixProvider); diff --git a/src/plugins/cppeditor/cpphighlighterfactory.cpp b/src/plugins/cppeditor/cpphighlighterfactory.cpp new file mode 100644 index 0000000000..32af1d125e --- /dev/null +++ b/src/plugins/cppeditor/cpphighlighterfactory.cpp @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +#include "cpphighlighterfactory.h" +#include "cppeditorconstants.h" +#include "cpphighlighter.h" + +using namespace CppEditor::Internal; + +CppHighlighterFactory::CppHighlighterFactory() +{ + setId(CppEditor::Constants::CPPEDITOR_ID); + addMimeType(CppEditor::Constants::C_SOURCE_MIMETYPE); + addMimeType(CppEditor::Constants::C_HEADER_MIMETYPE); + addMimeType(CppEditor::Constants::CPP_SOURCE_MIMETYPE); + addMimeType(CppEditor::Constants::CPP_HEADER_MIMETYPE); +} + +TextEditor::SyntaxHighlighter *CppHighlighterFactory::createHighlighter() const +{ + return new CppHighlighter; +} diff --git a/src/plugins/cppeditor/cpphighlighterfactory.h b/src/plugins/cppeditor/cpphighlighterfactory.h new file mode 100644 index 0000000000..6fc4283b31 --- /dev/null +++ b/src/plugins/cppeditor/cpphighlighterfactory.h @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +****************************************************************************/ + +#ifndef CPPHIGHLIGHTERFACTORY_H +#define CPPHIGHLIGHTERFACTORY_H + +#include + +namespace CppEditor { +namespace Internal { + +class CppHighlighterFactory : public TextEditor::IHighlighterFactory +{ + Q_OBJECT + +public: + CppHighlighterFactory(); + + virtual TextEditor::SyntaxHighlighter *createHighlighter() const; +}; + +} // namespace Internal +} // namespace CppEditor + +#endif // CPPHIGHLIGHTERFACTORY_H -- cgit v1.2.1