aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--editors/code/.eslintrc.js1
-rw-r--r--editors/code/src/color_theme.ts8
-rw-r--r--editors/code/src/commands/expand_macro.ts4
-rw-r--r--editors/code/src/installation/fetch_artifact_release_info.ts1
4 files changed, 8 insertions, 6 deletions
diff --git a/editors/code/.eslintrc.js b/editors/code/.eslintrc.js
index 113a8a78e..5cda886ed 100644
--- a/editors/code/.eslintrc.js
+++ b/editors/code/.eslintrc.js
@@ -12,6 +12,7 @@ module.exports = {
12 "@typescript-eslint" 12 "@typescript-eslint"
13 ], 13 ],
14 "rules": { 14 "rules": {
15 "camelcase": ["error"],
15 "@typescript-eslint/member-delimiter-style": [ 16 "@typescript-eslint/member-delimiter-style": [
16 "error", 17 "error",
17 { 18 {
diff --git a/editors/code/src/color_theme.ts b/editors/code/src/color_theme.ts
index 2f2a39877..5b9327b28 100644
--- a/editors/code/src/color_theme.ts
+++ b/editors/code/src/color_theme.ts
@@ -83,11 +83,11 @@ function loadThemeNamed(themeName: string): ColorTheme {
83 res.mergeFrom(loadThemeFile(themePath)); 83 res.mergeFrom(loadThemeFile(themePath));
84 } 84 }
85 85
86 const global_customizations: any = vscode.workspace.getConfiguration('editor').get('tokenColorCustomizations'); 86 const globalCustomizations: any = vscode.workspace.getConfiguration('editor').get('tokenColorCustomizations');
87 res.mergeFrom(ColorTheme.fromRules(global_customizations?.textMateRules ?? [])); 87 res.mergeFrom(ColorTheme.fromRules(globalCustomizations?.textMateRules ?? []));
88 88
89 const theme_customizations: any = vscode.workspace.getConfiguration('editor.tokenColorCustomizations').get(`[${themeName}]`); 89 const themeCustomizations: any = vscode.workspace.getConfiguration('editor.tokenColorCustomizations').get(`[${themeName}]`);
90 res.mergeFrom(ColorTheme.fromRules(theme_customizations?.textMateRules ?? [])); 90 res.mergeFrom(ColorTheme.fromRules(themeCustomizations?.textMateRules ?? []));
91 91
92 92
93 return res; 93 return res;
diff --git a/editors/code/src/commands/expand_macro.ts b/editors/code/src/commands/expand_macro.ts
index 6fee6eb41..edec9bbc1 100644
--- a/editors/code/src/commands/expand_macro.ts
+++ b/editors/code/src/commands/expand_macro.ts
@@ -31,7 +31,7 @@ interface ExpandedMacro {
31 expansion: string; 31 expansion: string;
32} 32}
33 33
34function code_format(expanded: ExpandedMacro): string { 34function codeFormat(expanded: ExpandedMacro): string {
35 let result = `// Recursive expansion of ${expanded.name}! macro\n`; 35 let result = `// Recursive expansion of ${expanded.name}! macro\n`;
36 result += '// ' + '='.repeat(result.length - 3); 36 result += '// ' + '='.repeat(result.length - 3);
37 result += '\n\n'; 37 result += '\n\n';
@@ -65,7 +65,7 @@ class TextDocumentContentProvider
65 65
66 if (expanded == null) return 'Not available'; 66 if (expanded == null) return 'Not available';
67 67
68 return code_format(expanded); 68 return codeFormat(expanded);
69 } 69 }
70 70
71 get onDidChange(): vscode.Event<vscode.Uri> { 71 get onDidChange(): vscode.Event<vscode.Uri> {
diff --git a/editors/code/src/installation/fetch_artifact_release_info.ts b/editors/code/src/installation/fetch_artifact_release_info.ts
index 71889e82a..1e764718c 100644
--- a/editors/code/src/installation/fetch_artifact_release_info.ts
+++ b/editors/code/src/installation/fetch_artifact_release_info.ts
@@ -46,6 +46,7 @@ export async function fetchArtifactReleaseInfo(
46 name: string; 46 name: string;
47 assets: Array<{ 47 assets: Array<{
48 name: string; 48 name: string;
49 // eslint-disable-next-line camelcase
49 browser_download_url: string; 50 browser_download_url: string;
50 }>; 51 }>;
51 } 52 }