From e8a6c7e9c50215213db5ae2f580306b74364b063 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Wed, 30 Aug 2017 18:58:50 +0200
Subject: [PATCH] Clang: Add placeholder text to Clang Query

Task-number: QTCREATORBUG-18815
Change-Id: Ie5d53f0b3f2464408bb09022483a3a6258e8173d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../clangqueryexampletexteditorwidget.cpp     |  1 +
 .../clangqueryprojectsfindfilter.ui           | 35 ++++++++++++++++---
 .../clangquerytexteditorwidget.cpp            |  1 +
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/plugins/clangrefactoring/clangqueryexampletexteditorwidget.cpp b/src/plugins/clangrefactoring/clangqueryexampletexteditorwidget.cpp
index 19273d5ede..79ff5576b9 100644
--- a/src/plugins/clangrefactoring/clangqueryexampletexteditorwidget.cpp
+++ b/src/plugins/clangrefactoring/clangqueryexampletexteditorwidget.cpp
@@ -36,6 +36,7 @@ ClangQueryExampleTextEditorWidget::ClangQueryExampleTextEditorWidget(QWidget *pa
 {
     m_syntaxHighlighter = new ClangQueryExampleHighlighter;
     textDocument()->setSyntaxHighlighter(m_syntaxHighlighter);
+    textDocument()->setPlainText("class Foo {\n    void function() { int local; }\n    int field;\n};");
 }
 
 ClangQueryExampleHighlighter *ClangQueryExampleTextEditorWidget::syntaxHighlighter() const
diff --git a/src/plugins/clangrefactoring/clangqueryprojectsfindfilter.ui b/src/plugins/clangrefactoring/clangqueryprojectsfindfilter.ui
index 9fbad01f0b..819fae485d 100644
--- a/src/plugins/clangrefactoring/clangqueryprojectsfindfilter.ui
+++ b/src/plugins/clangrefactoring/clangqueryprojectsfindfilter.ui
@@ -6,14 +6,29 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1241</width>
-    <height>471</height>
+    <width>512</width>
+    <height>390</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+    <horstretch>1</horstretch>
+    <verstretch>1</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>512</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetMinimumSize</enum>
+   </property>
    <property name="leftMargin">
     <number>0</number>
    </property>
@@ -30,20 +45,32 @@
     <widget class="ClangRefactoring::ClangQueryExampleTextEditorWidget" name="exampleSourceTextEdit">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
+       <horstretch>1</horstretch>
        <verstretch>3</verstretch>
       </sizepolicy>
      </property>
+     <property name="placeholderText">
+      <string notr="true">class Foo { void function() { int x; } };</string>
+     </property>
     </widget>
    </item>
    <item>
     <widget class="ClangRefactoring::ClangQueryTextEditorWidget" name="queryTextEdit">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-       <horstretch>0</horstretch>
+       <horstretch>1</horstretch>
        <verstretch>1</verstretch>
       </sizepolicy>
      </property>
+     <property name="minimumSize">
+      <size>
+       <width>700</width>
+       <height>0</height>
+      </size>
+     </property>
+     <property name="placeholderText">
+      <string notr="true">functionDecl()</string>
+     </property>
     </widget>
    </item>
   </layout>
diff --git a/src/plugins/clangrefactoring/clangquerytexteditorwidget.cpp b/src/plugins/clangrefactoring/clangquerytexteditorwidget.cpp
index 2d0552680c..e24d6eab5e 100644
--- a/src/plugins/clangrefactoring/clangquerytexteditorwidget.cpp
+++ b/src/plugins/clangrefactoring/clangquerytexteditorwidget.cpp
@@ -38,6 +38,7 @@ ClangQueryTextEditorWidget::ClangQueryTextEditorWidget(QWidget *parent)
       m_hoverHandler(std::make_unique<ClangQueryHoverHandler>(m_syntaxHighlighter))
 {
     textDocument()->setSyntaxHighlighter(m_syntaxHighlighter);
+    textDocument()->setPlainText("functionDecl()");
 
     addHoverHandler(m_hoverHandler.get());
 }
-- 
GitLab