diff --git a/packages/language-server/src/__tests__/fixtures/script/class-api-basic/__snapshots__/class-api-basic.expected/index.ts b/packages/language-server/src/__tests__/fixtures/script/class-api-basic/__snapshots__/class-api-basic.expected/index.ts
index 4bbb5d27..11c5a0df 100644
--- a/packages/language-server/src/__tests__/fixtures/script/class-api-basic/__snapshots__/class-api-basic.expected/index.ts
+++ b/packages/language-server/src/__tests__/fixtures/script/class-api-basic/__snapshots__/class-api-basic.expected/index.ts
@@ -67,7 +67,7 @@ export { type Component };
});
if (isSmartOnly) {
Marko._.renderNativeTag("span")()()({
- class: "subnote",
+ class: "sub-note",
[Marko._.content /*span*/]: (() => {
isSmartOnly;
return () => {
@@ -77,7 +77,7 @@ export { type Component };
});
}
Marko._.renderNativeTag("span")()()({
- class: "subnote",
+ class: "sub-note",
[Marko._.content /*span*/]: (() => {
type;
return () => {
diff --git a/packages/language-server/src/__tests__/fixtures/script/class-api-basic/index.marko b/packages/language-server/src/__tests__/fixtures/script/class-api-basic/index.marko
index 231c0553..7fde867b 100644
--- a/packages/language-server/src/__tests__/fixtures/script/class-api-basic/index.marko
+++ b/packages/language-server/src/__tests__/fixtures/script/class-api-basic/index.marko
@@ -54,10 +54,10 @@ $ {
Year: ${year}
- isSmartPhone: ${isSmartOnly}
+ isSmartPhone: ${isSmartOnly}
- phoneType: ${type}
+ phoneType: ${type}
$ {
const mobiles:Array = component.input.mobileList;
mobiles.forEach((mobile:Mobile) => {
diff --git a/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.html b/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.html
index 19a473ff..6b2284f8 100644
--- a/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.html
+++ b/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.html
@@ -2,10 +2,10 @@
Year: placeholder
- isSmartPhone: placeholder
+ isSmartPhone: placeholder
- phoneType: placeholder
+ phoneType: placeholder
diff --git a/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.md b/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.md
index 5151646b..68eb8d42 100644
--- a/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.md
+++ b/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.md
@@ -1,7 +1,7 @@
## Hovers
### Ln 31, Col 29
```marko
- 29 |
phoneType: ${type}
+ 29 |
phoneType: ${type}
30 |
> 31 |
| ^ const mobileList: Mobile[]
diff --git a/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.ts b/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.ts
index 3ffbc9c4..140d72a6 100644
--- a/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.ts
+++ b/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/__snapshots__/tags-api-basic.expected/index.ts
@@ -50,7 +50,7 @@ function __marko_internal_template(this: void) {
});
if (isSmartOnly) {
Marko._.renderNativeTag("span")()()({
- class: "subnote",
+ class: "sub-note",
[Marko._.content /*span*/]: (() => {
isSmartOnly;
return () => {
@@ -60,7 +60,7 @@ function __marko_internal_template(this: void) {
});
}
Marko._.renderNativeTag("span")()()({
- class: "subnote",
+ class: "sub-note",
[Marko._.content /*span*/]: (() => {
type;
return () => {
diff --git a/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/index.marko b/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/index.marko
index 2fa6187c..728575e8 100644
--- a/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/index.marko
+++ b/packages/language-server/src/__tests__/fixtures/script/tags-api-basic/index.marko
@@ -23,10 +23,10 @@ static var useA = true;
Year: ${year}
- isSmartPhone: ${isSmartOnly}
+ isSmartPhone: ${isSmartOnly}
- phoneType: ${type}
+ phoneType: ${type}
// ^?
diff --git a/packages/language-server/src/__tests__/index.test.ts b/packages/language-server/src/__tests__/index.test.ts
index 9ec17451..fdfd1512 100644
--- a/packages/language-server/src/__tests__/index.test.ts
+++ b/packages/language-server/src/__tests__/index.test.ts
@@ -7,7 +7,7 @@ import { TextDocument } from "vscode-languageserver-textdocument";
// import { bench, run } from "mitata";
import { URI } from "vscode-uri";
-import MarkoLangaugeService, { documents } from "../service";
+import MarkoLanguageService, { documents } from "../service";
import { codeFrame } from "./util/code-frame";
Project.setDefaultTypePaths({
@@ -44,7 +44,7 @@ for (const subdir of fs.readdirSync(FIXTURE_DIR)) {
let results = "";
for (const position of getHovers(doc)) {
- const hoverInfo = await MarkoLangaugeService.doHover(
+ const hoverInfo = await MarkoLanguageService.doHover(
doc,
{
position,
@@ -86,7 +86,7 @@ for (const subdir of fs.readdirSync(FIXTURE_DIR)) {
language: string;
content: string;
}
- | undefined = await MarkoLangaugeService.commands[
+ | undefined = await MarkoLanguageService.commands[
"$/showScriptOutput"
](doc.uri);
if (scriptOutput) {
@@ -107,7 +107,7 @@ for (const subdir of fs.readdirSync(FIXTURE_DIR)) {
language: string;
content: string;
}
- | undefined = await MarkoLangaugeService.commands["$/showHtmlOutput"](
+ | undefined = await MarkoLanguageService.commands["$/showHtmlOutput"](
doc.uri,
);
if (htmlOutput) {
@@ -120,7 +120,7 @@ for (const subdir of fs.readdirSync(FIXTURE_DIR)) {
});
}
- const errors = await MarkoLangaugeService.doValidate(doc);
+ const errors = await MarkoLanguageService.doValidate(doc);
if (errors && errors.length) {
results += "## Diagnostics\n";
diff --git a/packages/language-tools/src/extractors/html/keywords.ts b/packages/language-tools/src/extractors/html/keywords.ts
index 95f13efe..aa2d7694 100644
--- a/packages/language-tools/src/extractors/html/keywords.ts
+++ b/packages/language-tools/src/extractors/html/keywords.ts
@@ -1,4 +1,5 @@
const builtinTagsRegex =
+ /* cspell:disable-next-line */
/^(?:a(?:(?:bbr|cronym|ddress|pplet|r(?:ea|ticle)|side|udio))?|b(?:(?:ase(?:font)?|d[io]|gsound|ig|l(?:ink|ockquote)|ody|r|utton))?|c(?:a(?:nvas|ption)|enter|ite|o(?:de|l(?:group)?|mmand|ntent))|d(?:ata(?:list)?|d|e(?:l|tails)|fn|i(?:alog|r|v)|l|t)|e(?:lement|m(?:bed)?)|f(?:i(?:eldset|g(?:caption|ure))|o(?:nt|oter|rm)|rame(?:set)?)|h(?:1|2|3|4|5|6|ead(?:er)?|group|r|tml)|i(?:(?:frame|m(?:age|g)|n(?:put|s)|sindex))?|k(?:bd|eygen)|l(?:abel|egend|i(?:(?:nk|sting))?)|m(?:a(?:in|p|r(?:k|quee)|th)|e(?:nu(?:item)?|t(?:a|er))|ulticol)|n(?:av|extid|o(?:br|embed|frames|script))|o(?:bject|l|pt(?:group|ion)|utput)|p(?:(?:aram|icture|laintext|r(?:e|ogress)))?|q|r(?:bc?|p|tc?|uby)|s(?:(?:amp|cript|e(?:ction|lect)|hadow|lot|mall|ource|pa(?:cer|n)|t(?:r(?:ike|ong)|yle)|u(?:b|mmary|p)|vg))?|t(?:able|body|d|e(?:mplate|xtarea)|foot|h(?:ead)?|i(?:me|tle)|r(?:ack)?|t)|ul?|v(?:ar|ideo)|wbr|xmp)$/;
export function isHTMLTag(tag: string) {
diff --git a/packages/language-tools/src/extractors/script/index.ts b/packages/language-tools/src/extractors/script/index.ts
index c27547aa..7bbff8f1 100644
--- a/packages/language-tools/src/extractors/script/index.ts
+++ b/packages/language-tools/src/extractors/script/index.ts
@@ -37,7 +37,7 @@ const SEP_COMMA_SPACE = ", ";
const SEP_COMMA_NEW_LINE = ",\n";
const VAR_LOCAL_PREFIX = "__marko_internal_";
const VAR_SHARED_PREFIX = `Marko._.`;
-const ATTR_UNAMED = "value";
+const ATTR_UNNAMED = "value";
const REG_EXT = /(?<=[/\\][^/\\]+)\.[^.]+$/;
const REG_BLOCK = /\s*{/y;
const REG_NEW_LINE = /^|(\r?\n)/g;
@@ -567,7 +567,7 @@ constructor(_?: Return) {}
.write("if (")
.copy(
this.#getRangeWithoutTrailingComma(child.args?.value) ||
- this.#getAttrValue(child, ATTR_UNAMED) ||
+ this.#getAttrValue(child, ATTR_UNNAMED) ||
"undefined",
)
.write(") {\n");
@@ -923,7 +923,7 @@ constructor(_?: Return) {}
// This is printed before the object key so that we can use the
// position of the default attribute even though there is no actual name in the source.
const defaultMapPosition = isDefault ? attr.name : undefined;
- let name: string | Range = isDefault ? ATTR_UNAMED : attr.name;
+ let name: string | Range = isDefault ? ATTR_UNNAMED : attr.name;
if (modifier) {
name = { start: attr.name.start, end: modifier.start - 1 };
@@ -1068,10 +1068,10 @@ constructor(_?: Return) {}
);
if (isValidProperty) {
- const propertNameStart = stringLiteralStart + 1;
+ const propertyNameStart = stringLiteralStart + 1;
this.#extractor.write("component.").copy({
- start: propertNameStart,
- end: propertNameStart + stringLiteralValue.length,
+ start: propertyNameStart,
+ end: propertyNameStart + stringLiteralValue.length,
});
} else {
this.#extractor
@@ -1232,7 +1232,7 @@ constructor(_?: Return) {}
.write("((\n")
.copy(
this.#getRangeWithoutTrailingComma(tag.args?.value) ||
- this.#getAttrValue(tag, ATTR_UNAMED) ||
+ this.#getAttrValue(tag, ATTR_UNNAMED) ||
"undefined",
)
.write("\n) ? ");
@@ -1570,7 +1570,7 @@ constructor(_?: Return) {}
condition:
this.#getRangeWithoutTrailingComma(
nextChild.args?.value,
- ) || this.#getAttrValue(nextChild, ATTR_UNAMED),
+ ) || this.#getAttrValue(nextChild, ATTR_UNNAMED),
node: nextChild as IfTagAlternate["node"],
};
@@ -1687,7 +1687,7 @@ constructor(_?: Return) {}
for (const attr of tag.attrs) {
if (
isValueAttribute(attr) &&
- (this.#read(attr.name) || ATTR_UNAMED) === name
+ (this.#read(attr.name) || ATTR_UNNAMED) === name
) {
return attr.value.value;
}
diff --git a/packages/language-tools/src/extractors/script/util/attach-scopes.ts b/packages/language-tools/src/extractors/script/util/attach-scopes.ts
index 88410abb..f066788a 100644
--- a/packages/language-tools/src/extractors/script/util/attach-scopes.ts
+++ b/packages/language-tools/src/extractors/script/util/attach-scopes.ts
@@ -72,7 +72,7 @@ export interface Mutation {
type Bindings = { [name: string]: Binding };
const VISITOR_KEYS = (t as any).VISITOR_KEYS;
-const ATTR_UNAMED = "value";
+const ATTR_UNNAMED = "value";
const Scopes = new WeakMap, Scope>();
const BoundAttrValueRange = new WeakMap<
Node.AttrValue,
@@ -185,7 +185,7 @@ export function crawlProgramScope(parsed: Parsed, scriptParser: ScriptParser) {
parsed,
lVal,
"",
- ATTR_UNAMED,
+ ATTR_UNNAMED,
)) {
const { name, objectPath, sourceName } = id;
const binding: VarBinding = (parentScope.bindings[name] = {
diff --git a/packages/language-tools/src/processors/marko.ts b/packages/language-tools/src/processors/marko.ts
index 08a750f7..e73c69f1 100644
--- a/packages/language-tools/src/processors/marko.ts
+++ b/packages/language-tools/src/processors/marko.ts
@@ -168,7 +168,7 @@ export default {
isExportComponentType(statement) || // skips the generated `export { type Component }`.
isImportComponentType(statement) || // skips the generated `import type Component from "..."`.
isExportEmptyInputType(statement) || // skips empty exported Input, eg `export type Input = {}` or `export interface Input {}`.
- isExportInputTypeAsComponentInput(statement) || // skips outputing `export type Input = Component["input"]` since it's inferred.
+ isExportInputTypeAsComponentInput(statement) || // skips outputting `export type Input = Component["input"]` since it's inferred.
(defaultExportId && // If the `export default` was an identifier, we also remove the variable that declared the identifier.
isVariableStatementForName(statement, defaultExportId))
) {
diff --git a/packages/vscode/NOTICE b/packages/vscode/NOTICE
index ab169531..0ee3ba3c 100644
--- a/packages/vscode/NOTICE
+++ b/packages/vscode/NOTICE
@@ -67,7 +67,7 @@ http://www.apache.org/licenses/LICENSE-2.0
THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
+MERCHANTABILITY OR NON-INFRINGEMENT.
See the Apache Version 2.0 License for specific language governing permissions
and limitations under the License.