Read multi-scope leaves in the Monarch and tree-sitter generators

The prior commit gave YAML number/bool/null plain scalars a space-separated
`string.unquoted constant.*` scope. The TextMate emitter wants the full chain,
but a single Monarch token / tree-sitter capture wants the LEAF (the semantic
type) — both `scopeToMonarch` and `scopeToCapture` matched the `string.` ancestor
first and mis-mapped numbers/booleans to 'string' / @string. Extract the leaf of
a space-separated scope before mapping; regenerate yaml.monarch.json.

Refs #12

Author: johnsoncodehk

src/gen-monarch.ts

@@ -104,6 +104,9 @@ function delimStateSuffix(delim: string): string {
 // BOTH highlighters agree on roles while each speaks its engine's idiom. Driven
 // by scope PREFIXES — language-agnostic.
 function scopeToMonarch(scope: string): string {
+  // A space-separated scope is `ancestor… leaf`; a single Monarch token wants the LEAF (the
+  // semantic type), not the string ancestor that only supplies the TextMate chain.
+  if (scope.includes(' ')) scope = scope.slice(scope.lastIndexOf(' ') + 1);
   if (scope.startsWith('comment')) return 'comment';
   if (scope.startsWith('string.regexp')) return 'regexp';
   if (scope.startsWith('string')) return 'string';

src/gen-treesitter.ts

@@ -883,6 +883,10 @@ function buildGrammarJs(ctx: GrammarJsContext, grammarName: string): string {
  * not on specific keywords.
  */
 function scopeToCapture(scope: string): string | null {
+  // A space-separated scope is `ancestor… leaf` (e.g. `string.unquoted constant.numeric` for a
+  // plain scalar that resolves to a number); a single tree-sitter capture wants the LEAF — the
+  // semantic type — not the string ancestor that only supplies context for the TextMate chain.
+  if (scope.includes(' ')) scope = scope.slice(scope.lastIndexOf(' ') + 1);
   // Ordered most-specific-first.
   const table: [string, string][] = [
     ['comment.block.documentation', '@comment.documentation'],