Support creating a conditional format with an "icon sets" rule

- Improvement compatibility for the worksheet extension lists
- Update unit test

Author: xuri

sparkline.go

@@ -14,6 +14,7 @@ package excelize
 import (
 	"encoding/xml"
 	"io"
+	"sort"
 	"strings"
 )
 
@@ -389,15 +390,14 @@ func (f *File) addSparklineGroupByStyle(ID int) *xlsxX14SparklineGroup {
 //	 Axis      | Show sparkline axis
 func (f *File) AddSparkline(sheet string, opts *SparklineOptions) error {
 	var (
-		err                            error
-		ws                             *xlsxWorksheet
-		sparkType                      string
-		sparkTypes                     map[string]string
-		specifiedSparkTypes            string
-		ok                             bool
-		group                          *xlsxX14SparklineGroup
-		groups                         *xlsxX14SparklineGroups
-		sparklineGroupsBytes, extBytes []byte
+		err                 error
+		ws                  *xlsxWorksheet
+		sparkType           string
+		sparkTypes          map[string]string
+		specifiedSparkTypes string
+		ok                  bool
+		group               *xlsxX14SparklineGroup
+		groups              *xlsxX14SparklineGroups
 	)
 
 	// parameter validation
@@ -434,25 +434,8 @@ func (f *File) AddSparkline(sheet string, opts *SparklineOptions) error {
 		group.RightToLeft = opts.Reverse
 	}
 	f.addSparkline(opts, group)
-	if ws.ExtLst.Ext != "" { // append mode ext
-		if err = f.appendSparkline(ws, group, groups); err != nil {
-			return err
-		}
-	} else {
-		groups = &xlsxX14SparklineGroups{
-			XMLNSXM:         NameSpaceSpreadSheetExcel2006Main.Value,
-			SparklineGroups: []*xlsxX14SparklineGroup{group},
-		}
-		if sparklineGroupsBytes, err = xml.Marshal(groups); err != nil {
-			return err
-		}
-		if extBytes, err = xml.Marshal(&xlsxWorksheetExt{
-			URI:     ExtURISparklineGroups,
-			Content: string(sparklineGroupsBytes),
-		}); err != nil {
-			return err
-		}
-		ws.ExtLst.Ext = string(extBytes)
+	if err = f.appendSparkline(ws, group, groups); err != nil {
+		return err
 	}
 	f.addSheetNameSpace(sheet, NameSpaceSpreadSheetX14)
 	return err
@@ -504,42 +487,50 @@ func (f *File) appendSparkline(ws *xlsxWorksheet, group *xlsxX14SparklineGroup,
 	var (
 		err                                                    error
 		idx                                                    int
-		decodeExtLst                                           *decodeWorksheetExt
+		appendMode                                             bool
+		decodeExtLst                                           = new(decodeWorksheetExt)
 		decodeSparklineGroups                                  *decodeX14SparklineGroups
 		ext                                                    *xlsxWorksheetExt
 		sparklineGroupsBytes, sparklineGroupBytes, extLstBytes []byte
 	)
-	decodeExtLst = new(decodeWorksheetExt)
-	if err = f.xmlNewDecoder(strings.NewReader("<extLst>" + ws.ExtLst.Ext + "</extLst>")).
-		Decode(decodeExtLst); err != nil && err != io.EOF {
-		return err
-	}
-	for idx, ext = range decodeExtLst.Ext {
-		if ext.URI == ExtURISparklineGroups {
-			decodeSparklineGroups = new(decodeX14SparklineGroups)
-			if err = f.xmlNewDecoder(strings.NewReader(ext.Content)).
-				Decode(decodeSparklineGroups); err != nil && err != io.EOF {
-				return err
-			}
-			if sparklineGroupBytes, err = xml.Marshal(group); err != nil {
-				return err
-			}
-			if groups == nil {
-				groups = &xlsxX14SparklineGroups{}
-			}
-			groups.XMLNSXM = NameSpaceSpreadSheetExcel2006Main.Value
-			groups.Content = decodeSparklineGroups.Content + string(sparklineGroupBytes)
-			if sparklineGroupsBytes, err = xml.Marshal(groups); err != nil {
-				return err
+	sparklineGroupBytes, _ = xml.Marshal(group)
+	if ws.ExtLst != nil { // append mode ext
+		if err = f.xmlNewDecoder(strings.NewReader("<extLst>" + ws.ExtLst.Ext + "</extLst>")).
+			Decode(decodeExtLst); err != nil && err != io.EOF {
+			return err
+		}
+		for idx, ext = range decodeExtLst.Ext {
+			if ext.URI == ExtURISparklineGroups {
+				decodeSparklineGroups = new(decodeX14SparklineGroups)
+				if err = f.xmlNewDecoder(strings.NewReader(ext.Content)).
+					Decode(decodeSparklineGroups); err != nil && err != io.EOF {
+					return err
+				}
+				if groups == nil {
+					groups = &xlsxX14SparklineGroups{}
+				}
+				groups.XMLNSXM = NameSpaceSpreadSheetExcel2006Main.Value
+				groups.Content = decodeSparklineGroups.Content + string(sparklineGroupBytes)
+				sparklineGroupsBytes, _ = xml.Marshal(groups)
+				decodeExtLst.Ext[idx].Content = string(sparklineGroupsBytes)
+				appendMode = true
 			}
-			decodeExtLst.Ext[idx].Content = string(sparklineGroupsBytes)
 		}
 	}
-	if extLstBytes, err = xml.Marshal(decodeExtLst); err != nil {
-		return err
-	}
-	ws.ExtLst = &xlsxExtLst{
-		Ext: strings.TrimSuffix(strings.TrimPrefix(string(extLstBytes), "<extLst>"), "</extLst>"),
+	if !appendMode {
+		sparklineGroupsBytes, _ = xml.Marshal(&xlsxX14SparklineGroups{
+			XMLNSXM:         NameSpaceSpreadSheetExcel2006Main.Value,
+			SparklineGroups: []*xlsxX14SparklineGroup{group},
+		})
+		decodeExtLst.Ext = append(decodeExtLst.Ext, &xlsxWorksheetExt{
+			URI: ExtURISparklineGroups, Content: string(sparklineGroupsBytes),
+		})
 	}
+	sort.Slice(decodeExtLst.Ext, func(i, j int) bool {
+		return inStrSlice(extensionURIPriority, decodeExtLst.Ext[i].URI, false) <
+			inStrSlice(extensionURIPriority, decodeExtLst.Ext[j].URI, false)
+	})
+	extLstBytes, err = xml.Marshal(decodeExtLst)
+	ws.ExtLst = &xlsxExtLst{Ext: strings.TrimSuffix(strings.TrimPrefix(string(extLstBytes), "<extLst>"), "</extLst>")}
 	return err
 }

sparkline_test.go

@@ -264,23 +264,23 @@ func TestAddSparkline(t *testing.T) {
 		Range:    []string{"Sheet2!A3:E3"},
 		Style:    -1,
 	}), ErrSparklineStyle.Error())
-
+	// Test creating a conditional format with existing extension lists
 	ws, ok := f.Sheet.Load("xl/worksheets/sheet1.xml")
 	assert.True(t, ok)
-	ws.(*xlsxWorksheet).ExtLst.Ext = `<extLst>
-	    <ext x14="http://schemas.microsoft.com/office/spreadsheetml/2009/9/main" uri="{05C60535-1F16-4fd2-B633-F4F36F0B64E0}">
-	        <x14:sparklineGroups
-	            xmlns:xm="http://schemas.microsoft.com/office/excel/2006/main">
-	             <x14:sparklineGroup>
-                    </x14:sparklines>
-                </x14:sparklineGroup>
-	        </x14:sparklineGroups>
-	    </ext>
-	</extLst>`
+	ws.(*xlsxWorksheet).ExtLst = &xlsxExtLst{Ext: `
+		<ext uri="{A8765BA9-456A-4dab-B4F3-ACF838C121DE}"><x14:slicerList /></ext>
+		<ext uri="{05C60535-1F16-4fd2-B633-F4F36F0B64E0}"><x14:sparklineGroups /></ext>`}
+	assert.NoError(t, f.AddSparkline("Sheet1", &SparklineOptions{
+		Location: []string{"A3"},
+		Range:    []string{"Sheet3!A2:J2"},
+		Type:     "column",
+	}))
+	// Test creating a conditional format with invalid extension list characters
+	ws.(*xlsxWorksheet).ExtLst.Ext = `<ext uri="{05C60535-1F16-4fd2-B633-F4F36F0B64E0}"><x14:sparklineGroups><x14:sparklineGroup></x14:sparklines></x14:sparklineGroup></x14:sparklineGroups></ext>`
 	assert.EqualError(t, f.AddSparkline("Sheet1", &SparklineOptions{
 		Location: []string{"A2"},
 		Range:    []string{"Sheet3!A1:J1"},
-	}), "XML syntax error on line 6: element <sparklineGroup> closed by </sparklines>")
+	}), "XML syntax error on line 1: element <sparklineGroup> closed by </sparklines>")
 }
 
 func TestAppendSparkline(t *testing.T) {