You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sh...@apache.org on 2023/03/29 18:41:15 UTC
[daffodil-vscode] branch main updated: - Make the dfdl prefix optional on dfdl format elements
This is an automated email from the ASF dual-hosted git repository.
shanedell pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git
The following commit(s) were added to refs/heads/main by this push:
new a77be40 - Make the dfdl prefix optional on dfdl format elements
a77be40 is described below
commit a77be4076533129ad087f97cea4c42d942ce76d9
Author: rt320 <98...@users.noreply.github.com>
AuthorDate: Wed Mar 29 08:04:31 2023 -0400
- Make the dfdl prefix optional on dfdl format elements
Closes #537
---
src/language/providers/attributeCompletion.ts | 44 ++++---
.../providers/intellisense/attributeItems.ts | 126 ++++++++++-----------
src/language/providers/utils.ts | 6 +-
src/tests/suite/language/items.test.ts | 2 +-
4 files changed, 99 insertions(+), 79 deletions(-)
diff --git a/src/language/providers/attributeCompletion.ts b/src/language/providers/attributeCompletion.ts
index 57b45a1..d2aed4a 100644
--- a/src/language/providers/attributeCompletion.ts
+++ b/src/language/providers/attributeCompletion.ts
@@ -26,6 +26,7 @@ import {
getXsdNsPrefix,
getItemsOnLineCount,
cursorWithinBraces,
+ dfdlDefaultPrefix,
} from './utils'
import { attributeCompletion } from './intellisense/attributeItems'
@@ -34,7 +35,8 @@ function getCompletionItems(
itemsToUse: string[],
preVal: string = '',
additionalItems: string = '',
- nsPrefix: string
+ nsPrefix: string,
+ dfdlPrefix: string
) {
let compItems: vscode.CompletionItem[] = getCommonItems(
itemsToUse,
@@ -43,12 +45,14 @@ function getCompletionItems(
nsPrefix
)
- attributeCompletion(additionalItems, nsPrefix).items.forEach((e) => {
- if (itemsToUse.includes(e.item)) {
- const completionItem = createCompletionItem(e, preVal, nsPrefix)
- compItems.push(completionItem)
+ attributeCompletion(additionalItems, nsPrefix, dfdlPrefix).items.forEach(
+ (e) => {
+ if (itemsToUse.includes(e.item)) {
+ const completionItem = createCompletionItem(e, preVal, nsPrefix)
+ compItems.push(completionItem)
+ }
}
- })
+ )
return compItems
}
@@ -163,7 +167,8 @@ function checkNearestOpenItem(
],
preVal,
additionalItems,
- nsPrefix
+ nsPrefix,
+ dfdlDefaultPrefix
)
case 'sequence':
return getCompletionItems(
@@ -176,7 +181,8 @@ function checkNearestOpenItem(
],
preVal,
'',
- nsPrefix
+ nsPrefix,
+ dfdlDefaultPrefix
)
case 'choice':
return getCompletionItems(
@@ -189,10 +195,17 @@ function checkNearestOpenItem(
],
'',
'',
- nsPrefix
+ nsPrefix,
+ dfdlDefaultPrefix
)
case 'group':
- return getCompletionItems(['ref', 'name'], '', '', nsPrefix)
+ return getCompletionItems(
+ ['ref', 'name'],
+ '',
+ '',
+ nsPrefix,
+ dfdlDefaultPrefix
+ )
case 'simpleType':
return getCompletionItems(
@@ -204,17 +217,19 @@ function checkNearestOpenItem(
],
'',
'',
- nsPrefix
+ nsPrefix,
+ dfdlDefaultPrefix
)
case 'assert':
return getCompletionItems(
['testKind', 'test', 'testPattern', 'message', 'failureType'],
'',
'',
- nsPrefix
+ nsPrefix,
+ ''
)
case 'discriminator':
- return getCompletionItems(['message'], '', '', nsPrefix)
+ return getCompletionItems(['message'], '', '', nsPrefix, '')
case 'format':
return getCompletionItems(
[
@@ -283,7 +298,8 @@ function checkNearestOpenItem(
],
'',
'',
- nsPrefix
+ nsPrefix,
+ ''
)
case 'defineVariable':
return getDefineVariableCompletionItems(preVal, additionalItems, nsPrefix)
diff --git a/src/language/providers/intellisense/attributeItems.ts b/src/language/providers/intellisense/attributeItems.ts
index 2861324..2943c1a 100644
--- a/src/language/providers/intellisense/attributeItems.ts
+++ b/src/language/providers/intellisense/attributeItems.ts
@@ -16,7 +16,7 @@
*/
// prettier-ignore
-export const attributeCompletion = (additionalItems, nsPrefix: string) => {
+export const attributeCompletion = (additionalItems, nsPrefix: string, dfdlPrefix: string) => {
return {
items: [
{
@@ -41,177 +41,177 @@ export const attributeCompletion = (additionalItems, nsPrefix: string) => {
},
{
item: 'dfdl:occursCount',
- snippetString: 'dfdl:occursCount="$1"$0',
+ snippetString: dfdlPrefix + 'occursCount="$1"$0',
markdownString: 'dfdl:occursCount property takes an expression which commonly looks in the Infoset via an expression, to obtain the count from another element.',
},
{
item: 'dfdl:byteOrder',
- snippetString: 'dfdl:byteOrder="${1|bigEndian,littleEndian|}"$0',
+ snippetString: dfdlPrefix + 'byteOrder="${1|bigEndian,littleEndian|}"$0',
markdownString: 'This property applies to all Number, Calendar (date and time), and Boolean types with representation binary',
},
{
item: 'dfdl:bitOrder',
- snippetString: 'dfdl:bitOrder="${1|mostSignificantBitFirst,leastSignificantBitFirst|}"$0',
+ snippetString: dfdlPrefix + 'bitOrder="${1|mostSignificantBitFirst,leastSignificantBitFirst|}"$0',
markdownString: 'Determines the specific bits of any grammar region',
},
{
item: 'dfdl:occursCountKind',
- snippetString: 'dfdl:occursCountKind="${1|expression,fixed,implicit,parsed,stopValue|}"$0',
+ snippetString: dfdlPrefix + 'occursCountKind="${1|expression,fixed,implicit,parsed,stopValue|}"$0',
markdownString: 'Specifies how the actual number of occurrences is to be established',
},
{
item: 'dfdl:length',
- snippetString: 'dfdl:length="$1"$0',
+ snippetString: dfdlPrefix + 'length="$1"$0',
markdownString: 'length can be an expression that resolves to an unsigned integer, or a literal unsigned integer',
},
{
item: 'dfdl:lengthKind',
- snippetString: 'dfdl:lengthKind="${1|delimited,fixed,explicit,implicit,prefixed,pattern,endOfParent|}"$0',
+ snippetString: dfdlPrefix + 'lengthKind="${1|delimited,fixed,explicit,implicit,prefixed,pattern,endOfParent|}"$0',
markdownString: 'lengthKind can be delimited, fixed, explicit, implicit, prefixed,pattern, or endOfParent',
},
{
item: 'dfdl:prefixIncludesPrefixLength',
- snippetString: 'dfdl:prefixIncludesPrefixLength="${1|yes,no|}"$0',
+ snippetString: dfdlPrefix + 'prefixIncludesPrefixLength="${1|yes,no|}"$0',
markdownString: 'Specifies whether the length given by a prefix includes the length of the prefix as well as the length of the content region',
},
{
item: 'dfdl:prefixLengthType',
- snippetString: 'dfdl:prefixLengthType="$1"$0',
+ snippetString: dfdlPrefix + 'prefixLengthType="$1"$0',
markdownString: 'Name of a simple type derived from xs:integer or any subtype of it.',
},
{
item: 'dfdl:utf16Width',
- snippetString: 'dfdl:utf16Width="${1|fixed,variable|}"$0',
+ snippetString: dfdlPrefix + 'utf16Width="${1|fixed,variable|}"$0',
markdownString: 'Specifies whether the encoding UTF-16 is treated as a fixed or variable width encoding',
},
{
item: 'dfdl:encoding',
- snippetString: 'dfdl:encoding="${1|US-ASCII,ASCII,UTF-8,UTF-16,UTF-16BE,UTF-16LE,ISO-8859-1|}"$0',
+ snippetString: dfdlPrefix + 'encoding="${1|US-ASCII,ASCII,UTF-8,UTF-16,UTF-16BE,UTF-16LE,ISO-8859-1|}"$0',
markdownString: 'This property can be computed by way of an expression which returns an appropriate string value',
},
{
item: 'dfdl:encodingErrorPolicy',
- snippetString: 'dfdl:encodingErrorPolicy="${1|error,replace|}"$0',
+ snippetString: dfdlPrefix + 'encodingErrorPolicy="${1|error,replace|}"$0',
markdownString: 'This property provides control of how decoding and encoding errors are handled when converting the data to text, or text to data',
},
{
item: 'dfdl:nilKind',
- snippetString: 'dfdl:nilKind="${1|literalCharacter,literalValue,logicalValue|}"$0',
+ snippetString: dfdlPrefix + 'nilKind="${1|literalCharacter,literalValue,logicalValue|}"$0',
markdownString: 'Specifies how dfdl:<nilValue> is interpreted to represent the nil value in the data stream'
},
{
item: 'dfdl:nilValue',
- snippetString: 'dfdl:nilValue="$1"$0',
+ snippetString: dfdlPrefix + 'nilValue="$1"$0',
markdownString: 'Used to provide a logical value that is used to indicate the data is nilled'
},
{
item: 'dfdl:nilValueDelimiterPolicy',
- snippetString: 'dfdl:nilValueDelimiterPolicy="${1|initiator,terminator,both,none|}"$0',
+ snippetString: dfdlPrefix + 'nilValueDelimiterPolicy="${1|initiator,terminator,both,none|}"$0',
markdownString: 'Controls whether matching one of the nil values also involves matching the initiator or terminator specified by the element',
},
{
item: 'dfdl:alignment',
- snippetString: 'dfdl:alignment="${1|1,2,implicit|}"$0',
+ snippetString: dfdlPrefix + 'alignment="${1|1,2,implicit|}"$0',
markdownString: "Alignment required for the beginning of the item.\nCan be non-negative integer or 'implicit'.",
},
{
item: 'dfdl:lengthUnits',
- snippetString: 'dfdl:lengthUnits="${1|bits,bytes,characters|}"$0',
+ snippetString: dfdlPrefix + 'lengthUnits="${1|bits,bytes,characters|}"$0',
markdownString: 'lengthUnits can be specified as bits, bytes, or characters',
},
{
item: 'dfdl:lengthPattern',
- snippetString: 'dfdl:lengthPattern="$1"$0',
+ snippetString: dfdlPrefix + 'lengthPattern="$1"$0',
markdownString: 'lengthPattern takes a regular expression which is used to scan the data stream for matching data',
},
{
item: 'dfdl:inputValueCalc',
- snippetString: 'dfdl:inputValueCalc="{$1}"$0',
+ snippetString: dfdlPrefix + 'inputValueCalc="{$1}"$0',
markdownString: 'An expression that calculates the value of the element when parsing',
},
{
item: 'dfdl:outputValueCalc',
- snippetString: 'dfdl:outputValueCalc="{$1}"$0',
+ snippetString: dfdlPrefix + 'outputValueCalc="{$1}"$0',
markdownString: 'An expression that calculates the value of the current element when unparsing',
},
{
item: 'dfdl:alignmentUnits',
- snippetString: 'dfdl:alignmentUnits="${1|bits,bytes|}"$0',
+ snippetString: dfdlPrefix + 'alignmentUnits="${1|bits,bytes|}"$0',
markdownString: "Scales the alignment.\nCan only be used when alignment is bits or bytes.\nValid values are 'bits or 'bytes'.",
},
{
item: 'dfdl:outputNewLine',
- snippetString: 'dfdl:outputNewLine="${1|%CR;,%LF;,%CR;%LF;,%NEL;,%LS;|}"$0',
+ snippetString: dfdlPrefix + 'outputNewLine="${1|%CR;,%LF;,%CR;%LF;,%NEL;,%LS;|}"$0',
markdownString: 'Specifies the character or characters that are used to replace the %NL; character class entity during unparse',
},
{
item: 'dfdl:choiceBranchKey',
- snippetString: 'dfdl:choiceBranchKey="$1"$0',
+ snippetString: dfdlPrefix + 'choiceBranchKey="$1"$0',
markdownString: 'List of DFDL String Literals',
},
{
item: 'dfdl:representation',
- snippetString: 'dfdl:representation="${1|binary,text|}"$0',
+ snippetString: dfdlPrefix + 'representation="${1|binary,text|}"$0',
markdownString: 'Identifies the physical representation of the element as text or binary',
},
{
item: 'dfdl:textStringJustification',
- snippetString: 'dfdl:textStringJustification="${1|left,right,center|}"$0',
+ snippetString: dfdlPrefix + 'textStringJustification="${1|left,right,center|}"$0',
markdownString: 'Specifies the string justification',
},
{
item: 'dfdl:textStandardZeroRep',
- snippetString: 'dfdl:textStandardZeroRep="0"$0',
+ snippetString: dfdlPrefix + 'textStandardZeroRep="0"$0',
markdownString: 'Specifies the whitespace separated list of alternative DFDL String Literals that are equivalent to zero ',
},
{
item: 'dfdl:textStandardInfinityRep',
- snippetString: 'dfdl:textStandardInfinityRep="Inf"$0',
+ snippetString: dfdlPrefix + 'textStandardInfinityRep="Inf"$0',
markdownString: 'The value used to represent infinity.',
},
{
item: 'dfdl:textStandardExponentRep',
- snippetString: 'dfdl:textStandardExponentRep="E"$0',
+ snippetString: dfdlPrefix + 'textStandardExponentRep="E"$0',
markdownString: 'Defines the actual character(s) that appear in the data as the exponent indicator',
},
{
item: 'dfdl:textStandardNaNRep',
- snippetString: 'dfdl:textStandardNaNRep="NaN"$0',
+ snippetString: dfdlPrefix + 'textStandardNaNRep="NaN"$0',
markdownString: 'Specifies the value used to represent NaN ',
},
{
item: 'dfdl:textNumberPattern',
- snippetString: 'dfdl:textNumberPattern="#,##0.###;-#,##0.###"$0',
+ snippetString: dfdlPrefix + 'textNumberPattern="#,##0.###;-#,##0.###"$0',
markdownString: 'Defines the ICU-like pattern that describes the format of the text number',
},
{
item: 'dfdl:textNumberRep',
- snippetString: 'dfdl:textNumberRep="${1|standard,zoned|}"$0',
+ snippetString: dfdlPrefix + 'textNumberRep="${1|standard,zoned|}"$0',
markdownString: 'Represented as standard characters in the character set encoding or represented as a zoned decimal in the character set encoding',
},
{
item: 'dfdl:textNumberRoundingMode',
- snippetString: 'dfdl:textNumberRoundingMode="${1|roundCeiling,roundFloor,roundDown,roundUp,roundHalfEven,roundHalfDown,roundHalfUp,roundUnnecessary|}"$0',
+ snippetString: dfdlPrefix + 'textNumberRoundingMode="${1|roundCeiling,roundFloor,roundDown,roundUp,roundHalfEven,roundHalfDown,roundHalfUp,roundUnnecessary|}"$0',
markdownString: 'Specifies how rounding occurs during unparsing',
},
{
item: 'dfdl:textNumberRoundingIncrement',
- snippetString: 'dfdl:textNumberRoundingIncrement="0"$0',
+ snippetString: dfdlPrefix + 'textNumberRoundingIncrement="0"$0',
markdownString: 'Specifies the rounding increment to use during unparsing',
},
{
item: 'dfdl:textNumberRounding',
- snippetString: 'dfdl:textNumberRounding="${1|explicit,pattern|}"$0',
+ snippetString: dfdlPrefix + 'textNumberRounding="${1|explicit,pattern|}"$0',
markdownString: 'Specifies how rounding is controlled during unparsing',
},
{
item: 'dfdl:textNumberCheckPolicy',
- snippetString: 'dfdl:textNumberCheckPolicy="${1|lax,strict|}"$0',
+ snippetString: dfdlPrefix + 'textNumberCheckPolicy="${1|lax,strict|}"$0',
markdownString: 'Indicates how lenient to be when parsing against the dfdl:textNumberPattern',
},
{
item: 'dfdl:textOutputMinLength',
- snippetString: 'dfdl:textOutputMinLength="0"$0',
+ snippetString: dfdlPrefix + 'textOutputMinLength="0"$0',
markdownString: 'Specifies the minimum content length during unparsing for simple types that do not allow the XSD minLength facet to be specified',
},
{
@@ -221,62 +221,62 @@ export const attributeCompletion = (additionalItems, nsPrefix: string) => {
},
{
item: 'dfdl:textPadKind',
- snippetString: 'dfdl:textPadKind="${1|none,padChar|}"$0',
+ snippetString: dfdlPrefix + 'textPadKind="${1|none,padChar|}"$0',
markdownString: 'Indicates whether to pad the data value on unparsing',
},
{
item: 'dfdl:textStandardBase',
- snippetString: 'dfdl:textStandardBase="${1|2,8,10,16|}"$0',
+ snippetString: dfdlPrefix + 'textStandardBase="${1|2,8,10,16|}"$0',
markdownString: 'Indicates the number base',
},
{
item: 'dfdl:textTrimKind',
- snippetString: 'dfdl:textTrimKind="${1|none,padChar|}"$0',
+ snippetString: dfdlPrefix + 'textTrimKind="${1|none,padChar|}"$0',
markdownString: 'Indicates whether to trim data on parsing',
},
{
item: 'dfdl:leadingSkip',
- snippetString: 'dfdl:trailingSkip="0$1"$0',
+ snippetString: dfdlPrefix + 'trailingSkip="0$1"$0',
markdownString: 'A non-negative number of bytes or bits to skip before alignment is applied',
},
{
item: 'dfdl:trailingSkip',
- snippetString: 'dfdl:trailingSkip="0$1"$0',
+ snippetString: dfdlPrefix + 'trailingSkip="0$1"$0',
markdownString: 'A non-negative number of bytes or bits to skip after the element,',
},
{
item: 'dfdl:truncateSpecifiedLengthString',
- snippetString: 'dfdl:truncateSpecifiedLengthString="${1|no,yes|}"$0',
+ snippetString: dfdlPrefix + 'truncateSpecifiedLengthString="${1|no,yes|}"$0',
markdownString: 'This property provides the means to express an error, or the strings can be truncated to fit when the strings in an Infoset being unparsed do not fit within those specified lengths',
},
{
item: 'dfdl:sequenceKind',
- snippetString: 'dfdl:SequenceKind ="${1|ordered,unordered|}"$0',
+ snippetString: dfdlPrefix + 'SequenceKind ="${1|ordered,unordered|}"$0',
markdownString: 'Defines whether the items are expected in the same order that they appear in the schema or in any order',
},
{
item: 'dfdl:separator',
- snippetString: 'dfdl:separator="$1"$0',
+ snippetString: dfdlPrefix + 'separator="$1"$0',
markdownString: 'Specifies a whitespace separated list of alternative DFDL String Literals that are the possible separators for the sequence',
},
{
item: 'dfdl:separatorPosition',
- snippetString: 'dfdl:separatorPosition="${1|infix,postfix,prefix|}"$0',
+ snippetString: dfdlPrefix + 'separatorPosition="${1|infix,postfix,prefix|}"$0',
markdownString: 'specifies where the separator occurs between the elements',
},
{
item: 'dfdl:separatorSuppressionPolicy',
- snippetString: 'dfdl:separatorSuppressionPolicy="${1|anyEmpty,never,trailingEmpty,trailingEmptyStrict|}"$0',
+ snippetString: dfdlPrefix + 'separatorSuppressionPolicy="${1|anyEmpty,never,trailingEmpty,trailingEmptyStrict|}"$0',
markdownString: 'Controls the circumstances when separators are expected in the data when parsing, or generated when unparsing',
},
{
item: 'dfdl:terminator',
- snippetString: 'dfdl:terminator="$1"$0',
+ snippetString: dfdlPrefix + 'terminator="$1"$0',
markdownString: 'charater or bytes found in the input stream that designate termination of an element',
},
{
item: 'dfdl:textBidi',
- snippetString: 'dfdl:textBidi="${1|no,yes|}"$0',
+ snippetString: dfdlPrefix + 'textBidi="${1|no,yes|}"$0',
markdownString: 'This property exists in anticipation of future DFDL features that enable bidirectional text processing',
},
{
@@ -286,72 +286,72 @@ export const attributeCompletion = (additionalItems, nsPrefix: string) => {
},
{
item: 'dfdl:choiceLengthKind',
- snippetString: 'dfdl:choiceLengthKind="${1|explicit,implicit|}"$0',
+ snippetString: dfdlPrefix + 'choiceLengthKind="${1|explicit,implicit|}"$0',
markdownString: 'Determines whether the branches of the choice are always filled (explicit) to the fixed-length specified by dfdl:choiceLength or not filled (implicit)',
},
{
item: 'dfdl:choiceLength',
- snippetString: 'dfdl:choiceLength="$1"$0',
+ snippetString: dfdlPrefix + 'choiceLength="$1"$0',
markdownString: 'Specifies the length of the choice in bytes, only used when dfdl:choiceLengthKind is explicit',
},
{
item: 'dfdl:fillByte',
- snippetString: 'dfdl:fillByte="$1"$0',
+ snippetString: dfdlPrefix + 'fillByte="$1"$0',
markdownString: 'A single byte specified as a DFDL byte value entity or a single character, used on unparsing to fill empty space',
},
{
item: 'dfdl:ignoreCase',
- snippetString: 'dfdl:ignoreCase="${1|no,yes|}"$0',
+ snippetString: dfdlPrefix + 'ignoreCase="${1|no,yes|}"$0',
markdownString: 'Whether mixed case data is accepted when matching delimiters and data values on input',
},
{
item: 'dfdl:initiatedContent',
- snippetString: 'dfdl:initiatedContent="${1|yes,no|}"$0',
+ snippetString: dfdlPrefix + 'initiatedContent="${1|yes,no|}"$0',
markdownString: 'yes indicates all branches of a choice are initiated\nno indicates the branch dfdl:initator property may be ste to empty string',
},
{
item: 'dfdl:initiator',
- snippetString: 'dfdl:initiator="$1"$0',
+ snippetString: dfdlPrefix + 'initiator="$1"$0',
markdownString: 'Specifies an ordered whitespace separated list of alternative DFDL String Literals one of which marks the beginning of the element or group of elements ',
},
{
item: 'dfdl:choiceDispatchKey',
- snippetString: 'dfdl:choiceDispatchKey="$1"$0',
+ snippetString: dfdlPrefix + 'choiceDispatchKey="$1"$0',
markdownString: 'The expression must evaluate to a string, the string must match one of the dfdl:choiceBranchKey property values of one of the branches of the choice',
},
{
item: 'dfdl:binaryNumberRep',
- snippetString: 'dfdl:binaryNumberRep="${1|binary,packed,bcd,ibm4690Packed|}"$0',
+ snippetString: dfdlPrefix + 'binaryNumberRep="${1|binary,packed,bcd,ibm4690Packed|}"$0',
markdownString: 'binary,packed,bcd, or ibm4690Packed',
},
{
item: 'dfdl:floating',
- snippetString: 'dfdl:floating="${1|no,yes|}"$0',
+ snippetString: dfdlPrefix + 'floating="${1|no,yes|}"$0',
markdownString: 'yes or no',
},
{
item: 'dfdl:binaryFloatRep',
- snippetString: 'dfdl:binaryFloatRep="${1|ieee,ibm390Hex|}"$0',
+ snippetString: dfdlPrefix + 'binaryFloatRep="${1|ieee,ibm390Hex|}"$0',
markdownString: 'ieee or ibm390Hex',
},
{
item: 'dfdl:calendarPatternKind',
- snippetString: 'dfdl:calendarPatternKind="${1|explicit,implicit|}"$0',
+ snippetString: dfdlPrefix + 'calendarPatternKind="${1|explicit,implicit|}"$0',
markdownString: 'The pattern is given by dfdl:calendarPattern explicit or the pattern is derived from the XML schema date/time type (implicit)',
},
{
item: "dfdl:documentFinalTerminatorCanBeMissing",
- snippetString: 'dfdl:documentFinalTerminatorCanBeMissing="${1|yes,no|}"$0',
+ snippetString: dfdlPrefix + 'documentFinalTerminatorCanBeMissing="${1|yes,no|}"$0',
markdownString: 'Specifies whether the final line can be missing',
},
{
item:'dfdl:emptyValueDelimiterPolicy',
- snippetString: 'dfdl:emptyValueDelimiterPolicy="${1|initiator,terminator,both,none|}"$0',
+ snippetString: dfdlPrefix + 'emptyValueDelimiterPolicy="${1|initiator,terminator,both,none|}"$0',
markdownString: 'Indicates which of initiator, terminator, both, or neither must be present when an element in the data stream is empty.',
},
{
item: 'dfdl:escapeSchemeRef',
- snippetString: 'dfdl:escapeSchemeRef="$1"$0',
+ snippetString: dfdlPrefix + 'escapeSchemeRef="$1"$0',
markdownString: "Refers to a named escape scheme definition via its qualified name",
},
{
@@ -361,7 +361,7 @@ export const attributeCompletion = (additionalItems, nsPrefix: string) => {
},
{
item: 'test',
- snippetString: 'dfdl:test="{$1}"$0',
+ snippetString: dfdlPrefix + 'test="{$1}"$0',
markdownString: 'A DFDL expression that evaluates to true or false.',
},
{
diff --git a/src/language/providers/utils.ts b/src/language/providers/utils.ts
index 205cbe0..811f6b2 100644
--- a/src/language/providers/utils.ts
+++ b/src/language/providers/utils.ts
@@ -48,7 +48,10 @@ export function getItems() {
}
// default namespace in the event that a namespace was not found
-const defaultXsdNsPrefix = ''
+export const defaultXsdNsPrefix = ''
+
+// dfdl namespace for dfdl format element in non dfdl tags
+export const dfdlDefaultPrefix = 'dfdl:'
// Function to insert snippet to active editor
export function insertSnippet(snippetString: string, backpos: vscode.Position) {
@@ -443,6 +446,7 @@ export function createCompletionItem(
'dfdl:representation',
'dfdl:choiceDispatchKey=',
'dfdl:simpleType',
+ 'dfdl:element',
'restriction',
]
diff --git a/src/tests/suite/language/items.test.ts b/src/tests/suite/language/items.test.ts
index 49a5a05..01b6f7b 100644
--- a/src/tests/suite/language/items.test.ts
+++ b/src/tests/suite/language/items.test.ts
@@ -140,7 +140,7 @@ suite('Items Test Suite', () => {
})
test('all attributeItems available', async () => {
- attributeCompletion('', '').items.forEach((item) => {
+ attributeCompletion('', '', 'dfdl:').items.forEach((item) => {
assert.strictEqual(expectedAttributeItems.includes(item.item), true)
})
})