Skip to content

Commit 41870ec

Browse files
Fix merge conflict residue in XmlProvider.fs: correct arg indices and list syntax
After PR #1629 (UseOriginalNames) was merged into main, the DtdProcessing branch had a merge conflict residue in XmlProvider.fs: 1. Both dtdProcessing and useOriginalNames were assigned from args.[11] - dtdProcessing should be args.[11] (DtdProcessing param, index 11) - useOriginalNames should be args.[12] (UseOriginalNames param, index 12) 2. The static parameters list had two closing brackets causing a syntax error that Fantomas could not parse. 3. The helpText had a duplicate triple-quote after the DtdProcessing param doc. Build verified (0 errors), Fantomas clean. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent a90304d commit 41870ec

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/FSharp.Data.DesignTime/Xml/XmlProvider.fs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ type public XmlProvider(cfg: TypeProviderConfig) as this =
5252
let inferenceMode = args.[9] :?> InferenceMode
5353
let preferDateOnly = args.[10] :?> bool
5454
let dtdProcessing = args.[11] :?> string
55-
let useOriginalNames = args.[11] :?> bool
55+
let useOriginalNames = args.[12] :?> bool
5656

5757
let inferenceMode =
5858
InferenceMode'.FromPublicApi(inferenceMode, inferTypesFromValues)
@@ -202,7 +202,7 @@ type public XmlProvider(cfg: TypeProviderConfig) as this =
202202
parameterDefaultValue = InferenceMode.BackwardCompatible
203203
)
204204
ProvidedStaticParameter("PreferDateOnly", typeof<bool>, parameterDefaultValue = false)
205-
ProvidedStaticParameter("DtdProcessing", typeof<string>, parameterDefaultValue = "Ignore") ]
205+
ProvidedStaticParameter("DtdProcessing", typeof<string>, parameterDefaultValue = "Ignore")
206206
ProvidedStaticParameter("UseOriginalNames", typeof<bool>, parameterDefaultValue = false) ]
207207

208208
let helpText =
@@ -228,7 +228,7 @@ type public XmlProvider(cfg: TypeProviderConfig) as this =
228228
Note inline schemas are not used from Xsd documents.
229229
</param>
230230
<param name='PreferDateOnly'>When true on .NET 6+, date-only strings are inferred as DateOnly and time-only strings as TimeOnly. Defaults to false for backward compatibility.</param>
231-
<param name='DtdProcessing'>Controls how DTD declarations in the XML are handled. Accepted values: "Ignore" (default, silently skips DTD processing, safe for most cases), "Prohibit" (throws on any DTD declaration), "Parse" (enables full DTD processing including entity expansion, use with caution).</param>"""
231+
<param name='DtdProcessing'>Controls how DTD declarations in the XML are handled. Accepted values: "Ignore" (default, silently skips DTD processing, safe for most cases), "Prohibit" (throws on any DTD declaration), "Parse" (enables full DTD processing including entity expansion, use with caution).</param>
232232
<param name='UseOriginalNames'>When true, XML element and attribute names are used as-is for generated property names instead of being normalized to PascalCase. Defaults to false.</param>"""
233233

234234

0 commit comments

Comments
 (0)