Templates editing updates #168
Conversation
This is available in the Spring '24 release.
This is available in the Spring '24 release.
to make our old tslint version happy, plus we don't need to support propagating 'this' here (and someone could just use a bound method if they did).
The builtin matches() method from jsonc actually does the equivalent of a starts-with, while in most cases we want to match on an exact json path (e.g. right to a field, and not to a subfield of the final part of the path pattern).
| // values under "values") | ||
| location.path.length === 4 | ||
| location.isAtPropertyKey && locationMatches(location, ['configuration', 'appConfiguration', 'values', '*']) |
There was a problem hiding this comment.
See the change in jsoncUtils.ts down below for what all these locationMatches() changes are about.
| @@ -382,38 +396,24 @@ describe('TemplateEditorManager configures layoutDefinition', () => { | |||
| await waitForDiagnostics(uri, d => d && d.length >= 4); | |||
| await waitForTemplateEditorManagerHas(await getTemplateEditorManager(), uriDirname(uri), true); | |||
|
|
|||
| const position = findPositionByJsonPath(doc, ['pages', 0, 'layout', 'center', 'items', 0, 'name']); | |||
There was a problem hiding this comment.
To avoid duplicating code too much, I moved this logic into a function.
| @@ -455,126 +455,69 @@ describe('TemplateEditorManager configures layoutDefinition', () => { | |||
| await waitForDiagnostics(uri, d => d && d.length >= 4); | |||
| await waitForTemplateEditorManagerHas(await getTemplateEditorManager(), uriDirname(uri), true); | |||
|
|
|||
| const position = findPositionByJsonPath(doc, ['pages', 0, 'layout', 'center', 'items', 0, 'name']); | |||
There was a problem hiding this comment.
Same here, made function to avoid code duplication.
| @@ -534,7 +547,7 @@ | |||
| ] | |||
| }, | |||
| "visibility": { | |||
| "description": "Controls if this item is visible. Value must be 'Disabled' (valid only for Variable items), 'Hidden', 'Visible', or a {{...}} expression against variables that evaluates to one of those or true (Visible) or false (Hidden).", | |||
| "description": "Controls if this item is visible. Value must be 'Disabled' (valid only for Variable items and tiles), 'Hidden', 'Visible', or a {{...}} expression against variables that evaluates to one of those or true (Visible) or false (Hidden).", | |||
There was a problem hiding this comment.
@mblumreich - These descriptions in this schema file will show as hover text in vscode.
| let result: R; | ||
| let resultError: unknown | undefined; | ||
| let _fn: ((this: T, ...args: A) => R) | undefined = fn; | ||
| return function (this: T, ...args: A) { |
There was a problem hiding this comment.
tslint was spitting out an error (but not failing) about on this return of a function rather than a lambda. We don't need the this handling here anyways, so I just switched it to a lambda.
| @@ -76,7 +77,7 @@ export class JsonAttributeRelFilePathDefinitionProvider extends JsonAttributeDef | |||
| location.previousNode && | |||
| location.previousNode.type === 'string' && | |||
| location.previousNode.value && | |||
| this.patterns.some(location.matches) | |||
| this.patterns.some(p => locationMatches(location, p)) | |||
There was a problem hiding this comment.
Should you pass in false for the exact parameter, so it matches the existing behavior?
There was a problem hiding this comment.
Nope, I want the new exact match behavior here (like in almost all the places), since it's the correct thing.
What does this PR do?
datasetFileTemplateto rulesappliesTovisibilityto json schema (available in the Spring '24 release)Componentpage layout type, including completion, definition, and hover support for variables (available in the Spring '24 release)What issues does this PR fix or reference?
@W-14498704@, @W-14496669@, @W-14516604@, @W-14306583@