Skip to content

Commit

Permalink
chore: unify var names
Browse files Browse the repository at this point in the history
  • Loading branch information
Sec-ant committed Nov 28, 2023
1 parent d45b986 commit 3d37617
Show file tree
Hide file tree
Showing 12 changed files with 47 additions and 36 deletions.
7 changes: 4 additions & 3 deletions src/embedded/glsl/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,13 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<
typeof DEFAULT_IDENTIFIERS
>;

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export interface PrettierPluginDepsOptions {}

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -60,7 +61,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/embedded/html/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<
typeof DEFAULT_IDENTIFIERS
>;

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export interface PrettierPluginDepsOptions {
/* prettier built-in options */
}

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -51,7 +52,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/embedded/ini/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,15 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<
typeof DEFAULT_IDENTIFIERS
>;

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export interface PrettierPluginDepsOptions {
iniSpaceAroundEquals?: boolean;
}

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -45,7 +46,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/embedded/latex/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,13 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<
typeof DEFAULT_IDENTIFIERS
>;

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export interface PrettierPluginDepsOptions {}

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -45,7 +46,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/embedded/noop/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ import { embeddedLanguage } from "./embedded-language.js";

type EmbeddedIdentifiers = AutocompleteStringList<EmbeddedDefaultIdentifier[]>;

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -26,6 +27,6 @@ type Options = typeof options;
declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: EmbeddedIdentifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: EmbeddedIdentifiers;
}
}
7 changes: 4 additions & 3 deletions src/embedded/php/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<
typeof DEFAULT_IDENTIFIERS
>;

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export interface PrettierPluginDepsOptions {
phpVersion?:
Expand All @@ -40,7 +41,7 @@ export interface PrettierPluginDepsOptions {
}

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -56,7 +57,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/embedded/properties/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,16 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<
typeof DEFAULT_IDENTIFIERS
>;

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export interface PrettierPluginDepsOptions {
escapeNonLatin1?: boolean;
keySeparator?: " " | ":" | "=" | ": " | "= " | " : " | " = ";
}

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -39,7 +40,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/embedded/ruby/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<

const EMBEDDED_LANGUAGE_PARSER = "embeddedRubyParser";

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export interface PrettierPluginDepsOptions {
rubyPlugins?: AutocompleteStringList<
Expand All @@ -74,7 +75,7 @@ export interface PrettierPluginDepsOptions {
}

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -97,7 +98,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
[EMBEDDED_LANGUAGE_PARSER]?: RubyParser;
}
}
Expand Down
7 changes: 4 additions & 3 deletions src/embedded/sql/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<
typeof DEFAULT_IDENTIFIERS
>;

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export { PrettierPluginDepsOptions };

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -39,7 +40,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/embedded/toml/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<
typeof DEFAULT_IDENTIFIERS
>;

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export interface PrettierPluginDepsOptions extends PrettierTaploOptions {}

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -37,7 +38,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
}
}

Expand Down
7 changes: 4 additions & 3 deletions src/embedded/xml/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<
typeof DEFAULT_IDENTIFIERS
>;

const embeddedLanguageIdentifiers = makeIdentifiersOptionName(embeddedLanguage);
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export interface PrettierPluginDepsOptions {
xmlSelfClosingSpace?: boolean;
Expand All @@ -83,7 +84,7 @@ export interface PrettierPluginDepsOptions {
}

export const options = {
[embeddedLanguageIdentifiers]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -108,7 +109,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiers]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
/** @internal */
__embeddedXmlFragmentRecoverIndex?: [number] | [number, number];
}
Expand Down
6 changes: 3 additions & 3 deletions src/embedded/yaml/options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ type DefaultIdentifiersHolder = StringListToInterfaceKey<
typeof DEFAULT_IDENTIFIERS
>;

const embeddedLanguageIdentifiersOptionName =
const EMBEDDED_LANGUAGE_IDENTIFIERS =
makeIdentifiersOptionName(embeddedLanguage);

export interface PrettierPluginDepsOptions {
/* prettier built-in options */
}

export const options = {
[embeddedLanguageIdentifiersOptionName]: {
[EMBEDDED_LANGUAGE_IDENTIFIERS]: {
category: "Global",
type: "string",
array: true,
Expand All @@ -38,7 +38,7 @@ declare module "../types.js" {
interface EmbeddedOptions extends Options {}
interface EmbeddedDefaultIdentifiersHolder extends DefaultIdentifiersHolder {}
interface PrettierPluginEmbedOptions {
[embeddedLanguageIdentifiersOptionName]?: Identifiers;
[EMBEDDED_LANGUAGE_IDENTIFIERS]?: Identifiers;
}
}

Expand Down

0 comments on commit 3d37617

Please sign in to comment.