Address vscode-only settings in the settings-doc test

Author: eliericha

source/ada/lsp-ada_configurations.adb

@@ -364,8 +364,19 @@ package body LSP.Ada_Configurations is
 
          elsif Name = "showNotificationsOnErrors"
          then
-            --  This is a VS Code only setting, treated at the VS Code extension's level
+            --  This is a VS Code only setting, treated at the VS Code
+            --  extension's level. We still include it here to mark it as
+            --  recognized and to support the settings-doc test that checks
+            --  that each setting is documented.
             null;
+
+         elsif Name = "trace"
+         then
+            --  Same as above. Do not merge this branch with the previous one.
+            --  The settings-doc test relies on the fact that each setting has
+            --  a dedicated if-branch.
+            null;
+
          end if;
 
          Skip_Value (JSON, Index);

testsuite/settings-doc/test.sh

@@ -16,12 +16,12 @@ python3 get-schema-properties.py <"$1/integration/vscode/ada/schemas/als-setting
 grep 'if Name = "[^"]\+"' "$1/source/ada/lsp-ada_configurations.adb" | sed -e 's/.*"\([^"]\+\)"/\1/' >impl.txt
 # Remove the following settings from the implementation list because they are
 # either hidden, or nested
-exclude="onTypeFormatting indentOnly"
+exclude="onTypeFormatting indentOnly trace"
 for exc in $exclude; do
     echo "$(grep -v "$exc" <impl.txt)" >impl.txt
 done
 # Add the following properties because they are nested
-add="onTypeFormatting.indentOnly"
+add="onTypeFormatting.indentOnly trace.server"
 for a in $add; do
     echo "$a" >>impl.txt
 done
@@ -31,17 +31,18 @@ echo "$(sort <impl.txt)" >impl.txt
 # Check that all VS Code settings are documented
 diff -u pkg.txt doc.txt
 
-# The ada.trace.server setting exists only in VS Code and not in .als.json
-# files. So remove it before the comparison.
-#
-# We need to use a subshell because it's not allowed to read and write the same
-# file in one pipeline
-# echo "$(grep -v trace.server <doc.txt)" >doc.txt
-echo "$(grep -v trace.server <doc.txt)" >doc.txt
-
 # Check that all implemented settings are documented
 diff -u impl.txt doc.txt
 
+# Before comparing with the schema, we need to filter out VSCode-only settings
+# which are not defined in the schema and shouldn't be because we don't want to
+# allow such values in .als.json files.
+vscode_only="trace.server showNotificationsOnErrors"
+for s in $vscode_only; do
+    echo "$(grep -v "$s" impl.txt)" >impl.txt
+    echo "$(grep -v "$s" doc.txt)" >doc.txt
+done
+
 # Check that all implemented settings are defined in the JSON Schema
 diff -u impl.txt schema.txt