Bring in latest changes

This commit is contained in:
Christopher Schleiden
2023-01-09 14:06:35 -08:00
parent 7ba0613401
commit 23be948895
3 changed files with 13 additions and 12 deletions
@@ -22,7 +22,7 @@ export abstract class Definition {
// A key to uniquely identify a definition
public readonly key: string
public description: string | undefined
public readonly description: string | undefined
public constructor(key: string, definition?: MappingToken) {
this.key = key
@@ -10,7 +10,7 @@ import { TokenType } from "../tokens/types"
export class PropertyDefinition {
public readonly type: string = ""
public readonly required: boolean = false
public description: string | undefined
public readonly description: string | undefined
public constructor(token: TemplateToken) {
if (token.templateTokenType === TokenType.String) {
@@ -24,6 +24,7 @@ export class TemplateTokenError extends Error {
export abstract class TemplateToken {
// Fields for serialization
private readonly type: TokenType
private _description: string | undefined
public readonly file: number | undefined
public readonly range: TokenRange | undefined
public definitionInfo: DefinitionInfo | undefined
@@ -56,20 +57,20 @@ export abstract class TemplateToken {
return this.range?.start[1]
}
public get definition(): Definition | undefined {
return this.definitionInfo?.definition
}
get description(): string | undefined {
return this.propertyDefinition?.description || this.definition?.description
return (
this._description ||
this.propertyDefinition?.description ||
this.definition?.description
)
}
set description(description: string | undefined) {
if (this.propertyDefinition) {
this.propertyDefinition.description = description
} else if (this.definition) {
this.definition.description = description
}
}
public get definition(): Definition | undefined {
return this.definitionInfo?.definition
this._description = description
}
public abstract get isScalar(): boolean