ensure ? at end of xs:integer? within 'as' attribute within a function

does not cause a 'missing context-item' error

Author: pgfearo

src/xsltTokenDiagnostics.ts

@@ -1182,7 +1182,8 @@ export class XsltTokenDiagnostics {
 const nextToken = allTokens[index + 1];
 isPartialFunctionArg = (nextToken.charType === CharLevelState.rB || nextToken.value === ',');
 }
-if (!isNoArgFunctionCall && !isPartialFunctionArg && !XsltTokenDiagnostics.contextItemExists(elementStack, xpathStack, insideGlobalFunction)) {
+const withinTypeDeclarationAttr = tagAttributeNames.length > 0 && tagAttributeNames[tagAttributeNames.length - 1] === 'as';
+if (!withinTypeDeclarationAttr && !isNoArgFunctionCall && !isPartialFunctionArg && !XsltTokenDiagnostics.contextItemExists(elementStack, xpathStack, insideGlobalFunction)) {
 token.error = ErrorType.MissingContextItemGeneral;
 problemTokens.push(token);
 }

test/issue-144.xsl

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:fn="namespace-uri"
  version="3.0">
 
- <!-- the following type declarations should have no errors -->
+ <?START type declarations with NO ERRORS?>
  <xsl:variable name="test1" as="xs:integer" select="count(22)"/>
  <xsl:variable name="test2" as="map(xs:integer, map(xs:string, array(*)))" select="/*"/>
  <xsl:variable name="test3" as="xs:integer" select="1"/>
@@ -12,16 +13,28 @@
  select="function($a as element()) as xs:string {local-name($a)}"/>
  <xsl:variable name="test6" as="xs:boolean" select="2 instance of array(function())"/>
 
- <!-- all tokens in the following type declarations should be marked as errors -->
+ <xsl:function name="fn:main" as="item()*">
+ <xsl:param name="test7" as="xs:integer?"/>
+ <xsl:sequence select="$test7"/>
+ </xsl:function>
+ <?END type declarations with NO ERRORS?>
+ 
+ 
+ <?START type declarations WITH ERRORS?>
  <xsl:variable name="test1-error" as="xs:intege" select="count(22)"/>
  <xsl:variable name="test2-error" as="xs:map(xs:integeer, mapp(xs:sstring, aarray(*)))" select="/*"/>
  <xsl:variable name="test3-error" as="string" select="1"/>
  <xsl:variable name="test4-error" as="elejment('book')" select="/*"/>
+ <xsl:variable name="test5-error" as="" select="'the `as` attribute is empty'"/>
+ <?END type declarations WITH ERRORS?>
 
+ <?START auto-complete test?>
+
  <!-- 
  1. the 'as' attribute below should be marked with an error
  2. type within the 'as' attribute, the auto-complete list should be triggered and populated properly
  -->
  <xsl:variable name="test1-autocomplate" as="" select="'a string'"/>
+ <?END auto-complete test?>
 
 </xsl:stylesheet>