diff options
Diffstat (limited to 'src/plugins/haskell')
-rw-r--r-- | src/plugins/haskell/Haskell.json.in | 6 | ||||
-rw-r--r-- | src/plugins/haskell/haskelleditorfactory.cpp | 5 | ||||
-rw-r--r-- | src/plugins/haskell/haskellplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/haskell/haskellproject.cpp | 1 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/haskell/Haskell.json.in b/src/plugins/haskell/Haskell.json.in index 9cdb34694a..1473874ad9 100644 --- a/src/plugins/haskell/Haskell.json.in +++ b/src/plugins/haskell/Haskell.json.in @@ -6,7 +6,8 @@ "Vendor" : "Eike Ziller", "Copyright" : "(C) Eike Ziller", "License" : "MIT", - "Description" : "Haskell support", + "Description" : "Write source code in the Haskell language", + "LongDescription" : [], "Url" : "https://haskell.org", ${IDE_PLUGIN_DEPENDENCIES}, @@ -19,5 +20,6 @@ " <glob pattern='*.cabal'/>", " </mime-type>", "</mime-info>" - ] + ], + "JsonWizardPaths" : [ ":/haskell/share/wizards/" ] } diff --git a/src/plugins/haskell/haskelleditorfactory.cpp b/src/plugins/haskell/haskelleditorfactory.cpp index 89bf561b1f..55f077a9f9 100644 --- a/src/plugins/haskell/haskelleditorfactory.cpp +++ b/src/plugins/haskell/haskelleditorfactory.cpp @@ -13,7 +13,6 @@ #include <texteditor/textdocument.h> #include <texteditor/texteditor.h> -#include <texteditor/texteditoractionhandler.h> #include <texteditor/textindenter.h> #include <QAction> @@ -42,8 +41,8 @@ public: setId(Constants::C_HASKELLEDITOR_ID); setDisplayName(::Core::Tr::tr("Haskell Editor")); addMimeType("text/x-haskell"); - setEditorActionHandlers(TextEditorActionHandler::UnCommentSelection - | TextEditorActionHandler::FollowSymbolUnderCursor); + setOptionalActionMask( + OptionalActions::UnCommentSelection | OptionalActions::FollowSymbolUnderCursor); setDocumentCreator([] { return new TextDocument(Constants::C_HASKELLEDITOR_ID); }); setIndenterCreator([](QTextDocument *doc) { return new TextIndenter(doc); }); setEditorWidgetCreator(&createEditorWidget); diff --git a/src/plugins/haskell/haskellplugin.cpp b/src/plugins/haskell/haskellplugin.cpp index f8c32dc288..1041bf4695 100644 --- a/src/plugins/haskell/haskellplugin.cpp +++ b/src/plugins/haskell/haskellplugin.cpp @@ -39,8 +39,6 @@ public: Tr::tr("Haskell", "SnippetProvider")); setupHaskellActions(this); - - ProjectExplorer::JsonWizardFactory::addWizardPath(":/haskell/share/wizards/"); } }; diff --git a/src/plugins/haskell/haskellproject.cpp b/src/plugins/haskell/haskellproject.cpp index 01d652c49e..4d05ded890 100644 --- a/src/plugins/haskell/haskellproject.cpp +++ b/src/plugins/haskell/haskellproject.cpp @@ -54,7 +54,6 @@ public: private: void updateApplicationTargets(); - void refresh(); private: ParseGuard m_parseGuard; |