diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-16 14:48:48 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-16 16:16:02 -0700 |
| commit | 0b3381007cb201d5ee28aa80990cd14a1c376f18 (patch) | |
| tree | edf6910d3fa14c6a19d2c4490fa4b94739b9c4de /src/WixToolset.Core/CompilerCore.cs | |
| parent | 0d4df529a7e34f033112a1c6f16f749880334e7d (diff) | |
| download | wix-0b3381007cb201d5ee28aa80990cd14a1c376f18.tar.gz wix-0b3381007cb201d5ee28aa80990cd14a1c376f18.tar.bz2 wix-0b3381007cb201d5ee28aa80990cd14a1c376f18.zip | |
Centralize disallow inner text handling in ParseHalper
Fixes wixtoolset/issues#6237
Diffstat (limited to 'src/WixToolset.Core/CompilerCore.cs')
| -rw-r--r-- | src/WixToolset.Core/CompilerCore.cs | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs index ec22a8ec..d737b359 100644 --- a/src/WixToolset.Core/CompilerCore.cs +++ b/src/WixToolset.Core/CompilerCore.cs | |||
| @@ -206,6 +206,11 @@ namespace WixToolset.Core | |||
| 206 | return false; | 206 | return false; |
| 207 | } | 207 | } |
| 208 | 208 | ||
| 209 | internal void InnerTextDisallowed(XElement element) | ||
| 210 | { | ||
| 211 | this.parseHelper.InnerTextDisallowed(element); | ||
| 212 | } | ||
| 213 | |||
| 209 | /// <summary> | 214 | /// <summary> |
| 210 | /// Verifies that a filename is ambiguous. | 215 | /// Verifies that a filename is ambiguous. |
| 211 | /// </summary> | 216 | /// </summary> |
| @@ -1103,15 +1108,6 @@ namespace WixToolset.Core | |||
| 1103 | return this.parseHelper.ScheduleActionSymbol(this.ActiveSection, sourceLineNumbers, access, sequence, actionName, condition, beforeAction, afterAction, overridable); | 1108 | return this.parseHelper.ScheduleActionSymbol(this.ActiveSection, sourceLineNumbers, access, sequence, actionName, condition, beforeAction, afterAction, overridable); |
| 1104 | } | 1109 | } |
| 1105 | 1110 | ||
| 1106 | internal void VerifyNoInnerText(SourceLineNumber sourceLineNumbers, XElement element) | ||
| 1107 | { | ||
| 1108 | var innerText = Common.GetInnerText(element); | ||
| 1109 | if (!String.IsNullOrWhiteSpace(innerText)) | ||
| 1110 | { | ||
| 1111 | this.messaging.Write(ErrorMessages.IllegalInnerText(sourceLineNumbers, element.Name.LocalName, innerText)); | ||
| 1112 | } | ||
| 1113 | } | ||
| 1114 | |||
| 1115 | private static string CreateValueList(ValueListKind kind, IEnumerable<string> values) | 1111 | private static string CreateValueList(ValueListKind kind, IEnumerable<string> values) |
| 1116 | { | 1112 | { |
| 1117 | // Ideally, we could denote the list kind (and the list itself) directly in the | 1113 | // Ideally, we could denote the list kind (and the list itself) directly in the |
