From 7c98517c27b4d560b508579c8e50db1624dfa858 Mon Sep 17 00:00:00 2001
From: LenAnderson <Anderson.Len@outlook.com>
Date: Sun, 16 Jun 2024 23:15:44 -0400
Subject: [PATCH] add base class for name results

---
 .../autocomplete/AutoCompleteNameResult.js    | 33 ++-----------------
 .../AutoCompleteNameResultBase.js             | 31 +++++++++++++++++
 .../AutoCompleteSecondaryNameResult.js        |  4 +--
 3 files changed, 36 insertions(+), 32 deletions(-)
 create mode 100644 public/scripts/autocomplete/AutoCompleteNameResultBase.js

diff --git a/public/scripts/autocomplete/AutoCompleteNameResult.js b/public/scripts/autocomplete/AutoCompleteNameResult.js
index 41c19cf9f..f048d6383 100644
--- a/public/scripts/autocomplete/AutoCompleteNameResult.js
+++ b/public/scripts/autocomplete/AutoCompleteNameResult.js
@@ -1,36 +1,9 @@
-import { SlashCommandNamedArgumentAutoCompleteOption } from '../slash-commands/SlashCommandNamedArgumentAutoCompleteOption.js';
-import { AutoCompleteOption } from './AutoCompleteOption.js';
-// import { AutoCompleteSecondaryNameResult } from './AutoCompleteSecondaryNameResult.js';
+import { AutoCompleteNameResultBase } from './AutoCompleteNameResultBase.js';
+import { AutoCompleteSecondaryNameResult } from './AutoCompleteSecondaryNameResult.js';
 
 
 
-export class AutoCompleteNameResult {
-    /**@type {string} */ name;
-    /**@type {number} */ start;
-    /**@type {AutoCompleteOption[]} */ optionList = [];
-    /**@type {boolean} */ canBeQuoted = false;
-    /**@type {()=>string} */ makeNoMatchText = ()=>`No matches found for "${this.name}"`;
-    /**@type {()=>string} */ makeNoOptionsText = ()=>'No options';
-
-
-    /**
-     * @param {string} name Name (potentially partial) of the name at the requested index.
-     * @param {number} start Index where the name starts.
-     * @param {AutoCompleteOption[]} optionList A list of autocomplete options found in the current scope.
-     * @param {boolean} canBeQuoted Whether the name can be inside quotes.
-     * @param {()=>string} makeNoMatchText Function that returns text to show when no matches where found.
-     * @param {()=>string} makeNoOptionsText Function that returns text to show when no options are available to match against.
-     */
-    constructor(name, start, optionList = [], canBeQuoted = false, makeNoMatchText = null, makeNoOptionsText = null) {
-        this.name = name;
-        this.start = start;
-        this.optionList = optionList;
-        this.canBeQuoted = canBeQuoted;
-        this.noMatchText = makeNoMatchText ?? this.makeNoMatchText;
-        this.noOptionstext = makeNoOptionsText ?? this.makeNoOptionsText;
-    }
-
-
+export class AutoCompleteNameResult extends AutoCompleteNameResultBase {
     /**
      *
      * @param {string} text The whole text
diff --git a/public/scripts/autocomplete/AutoCompleteNameResultBase.js b/public/scripts/autocomplete/AutoCompleteNameResultBase.js
new file mode 100644
index 000000000..150ee68c5
--- /dev/null
+++ b/public/scripts/autocomplete/AutoCompleteNameResultBase.js
@@ -0,0 +1,31 @@
+import { SlashCommandNamedArgumentAutoCompleteOption } from '../slash-commands/SlashCommandNamedArgumentAutoCompleteOption.js';
+import { AutoCompleteOption } from './AutoCompleteOption.js';
+
+
+
+export class AutoCompleteNameResultBase {
+    /**@type {string} */ name;
+    /**@type {number} */ start;
+    /**@type {AutoCompleteOption[]} */ optionList = [];
+    /**@type {boolean} */ canBeQuoted = false;
+    /**@type {()=>string} */ makeNoMatchText = ()=>`No matches found for "${this.name}"`;
+    /**@type {()=>string} */ makeNoOptionsText = ()=>'No options';
+
+
+    /**
+     * @param {string} name Name (potentially partial) of the name at the requested index.
+     * @param {number} start Index where the name starts.
+     * @param {AutoCompleteOption[]} optionList A list of autocomplete options found in the current scope.
+     * @param {boolean} canBeQuoted Whether the name can be inside quotes.
+     * @param {()=>string} makeNoMatchText Function that returns text to show when no matches where found.
+     * @param {()=>string} makeNoOptionsText Function that returns text to show when no options are available to match against.
+     */
+    constructor(name, start, optionList = [], canBeQuoted = false, makeNoMatchText = null, makeNoOptionsText = null) {
+        this.name = name;
+        this.start = start;
+        this.optionList = optionList;
+        this.canBeQuoted = canBeQuoted;
+        this.noMatchText = makeNoMatchText ?? this.makeNoMatchText;
+        this.noOptionstext = makeNoOptionsText ?? this.makeNoOptionsText;
+    }
+}
diff --git a/public/scripts/autocomplete/AutoCompleteSecondaryNameResult.js b/public/scripts/autocomplete/AutoCompleteSecondaryNameResult.js
index 63eccf99f..e0e65fc7c 100644
--- a/public/scripts/autocomplete/AutoCompleteSecondaryNameResult.js
+++ b/public/scripts/autocomplete/AutoCompleteSecondaryNameResult.js
@@ -1,6 +1,6 @@
-import { AutoCompleteNameResult } from './AutoCompleteNameResult.js';
+import { AutoCompleteNameResultBase } from './AutoCompleteNameResultBase.js';
 
-export class AutoCompleteSecondaryNameResult extends AutoCompleteNameResult {
+export class AutoCompleteSecondaryNameResult extends AutoCompleteNameResultBase {
     /**@type {boolean}*/ isRequired = false;
     /**@type {boolean}*/ forceMatch = true;
 }