From cb81cd27cd1b162c381db4106cb29c4c397146a8 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 5 Apr 2019 08:32:58 +1100
Subject: Backport: Feature [feature-requests:#1272]. Add API to set default
 fold display text.

Backport of changeset 7400:9fcb52fdb307.
---
 src/ContractionState.cxx | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/ContractionState.cxx')

diff --git a/src/ContractionState.cxx b/src/ContractionState.cxx
index c5e352180..47f345ada 100644
--- a/src/ContractionState.cxx
+++ b/src/ContractionState.cxx
@@ -74,7 +74,6 @@ public:
 	bool HiddenLines() const override;
 
 	const char *GetFoldDisplayText(Sci::Line lineDoc) const override;
-	bool GetFoldDisplayTextShown(Sci::Line lineDoc) const override;
 	bool SetFoldDisplayText(Sci::Line lineDoc, const char *text) override;
 
 	bool GetExpanded(Sci::Line lineDoc) const override;
@@ -276,17 +275,12 @@ const char *ContractionState<LINE>::GetFoldDisplayText(Sci::Line lineDoc) const
 	return foldDisplayTexts->ValueAt(lineDoc).get();
 }
 
-template <typename LINE>
-bool ContractionState<LINE>::GetFoldDisplayTextShown(Sci::Line lineDoc) const {
-	return !GetExpanded(lineDoc) && GetFoldDisplayText(lineDoc);
-}
-
 template <typename LINE>
 bool ContractionState<LINE>::SetFoldDisplayText(Sci::Line lineDoc, const char *text) {
 	EnsureData();
 	const char *foldText = foldDisplayTexts->ValueAt(lineDoc).get();
 	if (!foldText || !text || 0 != strcmp(text, foldText)) {
-		UniqueString uns = UniqueStringCopy(text);
+		UniqueString uns = IsNullOrEmpty(text) ? UniqueString() : UniqueStringCopy(text);
 		foldDisplayTexts->SetValueAt(lineDoc, std::move(uns));
 		Check();
 		return true;
-- 
cgit v1.2.3