From 3087d95c7c3ce5f185feecaf882c9fb21626fa83 Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Sun, 31 Mar 2019 07:37:35 +1100
Subject: Backport: Feature [feature-requests:#1272]. Add
 FoldDisplayTextGetStyle to match FoldDisplayTextSetStyle.

Backport of changeset 7394:8fe3c581aeb9.
---
 doc/ScintillaDoc.html   | 4 +++-
 include/Scintilla.h     | 1 +
 include/Scintilla.iface | 5 ++++-
 src/Editor.cxx          | 3 +++
 test/simpleTests.py     | 5 +++++
 5 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/doc/ScintillaDoc.html b/doc/ScintillaDoc.html
index 0bd7c2243..127d33694 100644
--- a/doc/ScintillaDoc.html
+++ b/doc/ScintillaDoc.html
@@ -5985,6 +5985,7 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
      <a class="message" href="#SCI_TOGGLEFOLD">SCI_TOGGLEFOLD(int line)</a><br />
      <a class="message" href="#SCI_TOGGLEFOLDSHOWTEXT">SCI_TOGGLEFOLDSHOWTEXT(int line, const char *text)</a><br />
      <a class="message" href="#SCI_FOLDDISPLAYTEXTSETSTYLE">SCI_FOLDDISPLAYTEXTSETSTYLE(int style)</a><br />
+     <a class="message" href="#SCI_FOLDDISPLAYTEXTGETSTYLE">SCI_FOLDDISPLAYTEXTGETSTYLE &rarr; int</a><br />
      <a class="message" href="#SCI_FOLDLINE">SCI_FOLDLINE(int line, int action)</a><br />
      <a class="message" href="#SCI_FOLDCHILDREN">SCI_FOLDCHILDREN(int line, int action)</a><br />
      <a class="message" href="#SCI_FOLDALL">SCI_FOLDALL(int action)</a><br />
@@ -6148,7 +6149,8 @@ sptr_t CallScintilla(unsigned int iMessage, uptr_t wParam, sptr_t lParam){
     <code><a class="message" href="#StyleDefinition">STYLE_FOLDDISPLAYTEXT</a></code> style.</p>
 
     <p><b id="SCI_FOLDDISPLAYTEXTSETSTYLE">SCI_FOLDDISPLAYTEXTSETSTYLE(int style)</b><br />
-    This message changes the appearance of fold text tags.</p>
+    <b id="SCI_FOLDDISPLAYTEXTGETSTYLE">SCI_FOLDDISPLAYTEXTGETSTYLE &rarr; int</b><br />
+    These message changes the appearance of fold text tags.</p>
     <table class="standard" summary="Fold flags">
       <tbody>
         <tr>
diff --git a/include/Scintilla.h b/include/Scintilla.h
index 31115ad0c..1845b677a 100644
--- a/include/Scintilla.h
+++ b/include/Scintilla.h
@@ -492,6 +492,7 @@ typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam,
 #define SC_FOLDDISPLAYTEXT_STANDARD 1
 #define SC_FOLDDISPLAYTEXT_BOXED 2
 #define SCI_FOLDDISPLAYTEXTSETSTYLE 2701
+#define SCI_FOLDDISPLAYTEXTGETSTYLE 2707
 #define SC_FOLDACTION_CONTRACT 0
 #define SC_FOLDACTION_EXPAND 1
 #define SC_FOLDACTION_TOGGLE 2
diff --git a/include/Scintilla.iface b/include/Scintilla.iface
index a3820445a..c2dec218d 100644
--- a/include/Scintilla.iface
+++ b/include/Scintilla.iface
@@ -1233,9 +1233,12 @@ val SC_FOLDDISPLAYTEXT_HIDDEN=0
 val SC_FOLDDISPLAYTEXT_STANDARD=1
 val SC_FOLDDISPLAYTEXT_BOXED=2
 
-# Set the style of fold display text
+# Set the style of fold display text.
 set void FoldDisplayTextSetStyle=2701(int style,)
 
+# Get the style of fold display text.
+get int FoldDisplayTextGetStyle=2707(,)
+
 enu FoldAction=SC_FOLDACTION_
 val SC_FOLDACTION_CONTRACT=0
 val SC_FOLDACTION_EXPAND=1
diff --git a/src/Editor.cxx b/src/Editor.cxx
index a9df59f96..08a4ac76c 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -7188,6 +7188,9 @@ sptr_t Editor::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 		Redraw();
 		break;
 
+	case SCI_FOLDDISPLAYTEXTGETSTYLE:
+		return foldDisplayTextStyle;
+
 	case SCI_TOGGLEFOLD:
 		FoldLine(static_cast<Sci::Line>(wParam), SC_FOLDACTION_TOGGLE);
 		break;
diff --git a/test/simpleTests.py b/test/simpleTests.py
index 3af25247c..b5260c8a8 100644
--- a/test/simpleTests.py
+++ b/test/simpleTests.py
@@ -1634,6 +1634,11 @@ class TestStyleAttributes(unittest.TestCase):
 		self.ed.StyleSetHotSpot(self.ed.STYLE_DEFAULT, 1)
 		self.assertEquals(self.ed.StyleGetHotSpot(self.ed.STYLE_DEFAULT), 1)
 
+	def testFoldDisplayTextStyle(self):
+		self.assertEquals(self.ed.FoldDisplayTextGetStyle(), 0)
+		self.ed.FoldDisplayTextSetStyle(self.ed.SC_FOLDDISPLAYTEXT_BOXED)
+		self.assertEquals(self.ed.FoldDisplayTextGetStyle(), self.ed.SC_FOLDDISPLAYTEXT_BOXED)
+
 class TestIndices(unittest.TestCase):
 	def setUp(self):
 		self.xite = Xite.xiteFrame
-- 
cgit v1.2.3