Disable validation for certain lines

[diraneyya]

Describe the bug

I am using this snippet for the configuration:

{
  "plpgsqlLanguageServer.keywordQueryParameterPattern": [
    "@{keyword}",
    "sqlc\\.arg\\s*\\('{keyword}'\\)",
    "sqlc\\.narg\\s*\\('{keyword}'\\)",
  ],
  "plpgsqlLanguageServer.statements.separatorPattern": "-- name:[\\s]+.*",
}

The configuration key "plpgsqlLanguageServer.statements.separatorPattern" does not seem to be recognised for some reason:

However, and more importantly, I am unable to use it to avoid the validation of just two lines in my extension code:

-- plpgsql-language-server:use-keyword-query-parameter
-- pg_fetch_cycle extension v1.0
-- PostgreSQL extension for managing fetch cycles with pg_net
select 'pg_fetch_cycle extension loaded' as status;

-- These lines must not be validated

-- name: DoNotValidate :many
-- plpgsql-language-server:disable
alter system set pg_net.ttl to 'never';
alter system set pg_net.batch_size to 200;
select pg_reload_conf();

-- The rest of the file must be validated

-- name: Validate :many
do $drop$
begin
...

A screenshot:

Expected Behavior

For there to be no validation errors when the lines are ignored by the validator:

Current Behavior

Steps to Reproduce

NA

Environment

• Windows
• Mac
• Linux
• other (please specify)

[diraneyya]

I would highly appreciate any hint or advice.

[thedemons]

I believe the issue is that the condition
options.statements?.diagnosticsLevels?.disableFlag === "warning"
prevents the function from returning early during validation. This causes the server to ignore the plpgsql-language-server:use-keyword-query-parameter setting.

plpgsql-lsp/server/src/postgres/queries/queryFileSyntaxAnalysis.ts

Lines 257 to 266 in bfae0fc

	if (options.statements
	&& DISABLE_STATEMENT_VALIDATION_RE.test(maskedStatement)
	&& options.statements?.diagnosticsLevels?.disableFlag === "warning"
	) {
	return {
	severity: DiagnosticSeverity.Warning,
	range: getCurrentLineFromIndex(document.getText(), currentTextIndex),
	message: "Validation disabled",
	}
	}

That condition should be moved inside the inner block, so the function can return when the first two validation conditions are satisfied.

And also, when checking for the plpgsql-language-server:xxxxx options, it should extract the first line from the statement, not the entire document. Currently it prevents individual statements from having their own options, forcing them to share the configuration defined for the entire file.

plpgsql-lsp/server/src/postgres/parameters/defaultParameters.ts

Lines 16 to 22 in bfae0fc

	export function getDefaultQueryParameterInfo(
	document: TextDocument,
	statement: string,
	queryParameterPattern: string | string[],
	_logger: Logger,
	): DefaultQueryParametersInfo | null {
	const firstLine = getFirstLine(document)

[thedemons]

I've found the exact commit that broke this: 769e46d

Changed from:

    if (options.statements && DISABLE_STATEMENT_VALIDATION_RE.test(statement)) {
      if (options.statements?.diagnosticsLevels?.disableFlag === "warning") {
        diagnostics.push({
          severity: DiagnosticSeverity.Warning,
          range: getRange(documentText, currentPosition),
          message: "Validation disabled",
        })
      }

      continue
    }

to:

  if (options.statements
    && DISABLE_STATEMENT_VALIDATION_RE.test(maskedStatement)
    && options.statements?.diagnosticsLevels?.disableFlag === "warning"
  ) {
    return {
      severity: DiagnosticSeverity.Warning,
      range: getRange(document.getText(), currentPosition),
      message: "Validation disabled",
    }
  }