forked from qt-creator/qt-creator
GlslEditor: Hide GlslCompletionAssistProvider implementation
Change-Id: I02a27e338cbbb149ed5d7883c87864de183f8b94 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -162,21 +162,6 @@ static QIcon glslIcon(IconTypes iconType)
|
|||||||
// ----------------------------
|
// ----------------------------
|
||||||
// GlslCompletionAssistProvider
|
// GlslCompletionAssistProvider
|
||||||
// ----------------------------
|
// ----------------------------
|
||||||
IAssistProcessor *GlslCompletionAssistProvider::createProcessor(const AssistInterface *) const
|
|
||||||
{
|
|
||||||
return new GlslCompletionAssistProcessor;
|
|
||||||
}
|
|
||||||
|
|
||||||
int GlslCompletionAssistProvider::activationCharSequenceLength() const
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool GlslCompletionAssistProvider::isActivationCharSequence(const QString &sequence) const
|
|
||||||
{
|
|
||||||
return isActivationChar(sequence.at(0));
|
|
||||||
}
|
|
||||||
|
|
||||||
struct FunctionItem
|
struct FunctionItem
|
||||||
{
|
{
|
||||||
FunctionItem() = default;
|
FunctionItem() = default;
|
||||||
@@ -531,5 +516,36 @@ GlslCompletionAssistInterface::GlslCompletionAssistInterface(const QTextCursor &
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GlslCompletionAssistProvider
|
||||||
|
|
||||||
|
class GlslCompletionAssistProvider : public TextEditor::CompletionAssistProvider
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *) const override;
|
||||||
|
|
||||||
|
int activationCharSequenceLength() const override;
|
||||||
|
bool isActivationCharSequence(const QString &sequence) const override;
|
||||||
|
};
|
||||||
|
|
||||||
|
IAssistProcessor *GlslCompletionAssistProvider::createProcessor(const AssistInterface *) const
|
||||||
|
{
|
||||||
|
return new GlslCompletionAssistProcessor;
|
||||||
|
}
|
||||||
|
|
||||||
|
int GlslCompletionAssistProvider::activationCharSequenceLength() const
|
||||||
|
{
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GlslCompletionAssistProvider::isActivationCharSequence(const QString &sequence) const
|
||||||
|
{
|
||||||
|
return isActivationChar(sequence.at(0));
|
||||||
|
}
|
||||||
|
|
||||||
|
CompletionAssistProvider *createGlslCompletionAssistProvider()
|
||||||
|
{
|
||||||
|
return new GlslCompletionAssistProvider;
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
} // namespace GlslEditor
|
} // namespace GlslEditor
|
||||||
|
|||||||
@@ -54,19 +54,6 @@ private:
|
|||||||
friend class GlslEditorWidget;
|
friend class GlslEditorWidget;
|
||||||
};
|
};
|
||||||
|
|
||||||
class GlslCompletionAssistInterface;
|
|
||||||
|
|
||||||
class GlslCompletionAssistProvider : public TextEditor::CompletionAssistProvider
|
|
||||||
{
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
public:
|
|
||||||
TextEditor::IAssistProcessor *createProcessor(const TextEditor::AssistInterface *) const override;
|
|
||||||
|
|
||||||
int activationCharSequenceLength() const override;
|
|
||||||
bool isActivationCharSequence(const QString &sequence) const override;
|
|
||||||
};
|
|
||||||
|
|
||||||
class GlslCompletionAssistProcessor : public TextEditor::AsyncProcessor
|
class GlslCompletionAssistProcessor : public TextEditor::AsyncProcessor
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
@@ -98,5 +85,7 @@ private:
|
|||||||
Document::Ptr m_glslDoc;
|
Document::Ptr m_glslDoc;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
TextEditor::CompletionAssistProvider *createGlslCompletionAssistProvider();
|
||||||
|
|
||||||
} // namespace Internal
|
} // namespace Internal
|
||||||
} // namespace GlslEditor
|
} // namespace GlslEditor
|
||||||
|
|||||||
@@ -462,7 +462,7 @@ public:
|
|||||||
setIndenterCreator(&createGlslIndenter);
|
setIndenterCreator(&createGlslIndenter);
|
||||||
setSyntaxHighlighterCreator(&createGlslHighlighter);
|
setSyntaxHighlighterCreator(&createGlslHighlighter);
|
||||||
setCommentDefinition(Utils::CommentDefinition::CppStyle);
|
setCommentDefinition(Utils::CommentDefinition::CppStyle);
|
||||||
setCompletionAssistProvider(new GlslCompletionAssistProvider);
|
setCompletionAssistProvider(createGlslCompletionAssistProvider());
|
||||||
setParenthesesMatchingEnabled(true);
|
setParenthesesMatchingEnabled(true);
|
||||||
setCodeFoldingSupported(true);
|
setCodeFoldingSupported(true);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user