nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-12 00:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #3258

Browse Source 
3258: enforce camel case r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-02-21 10:23:10 +00:00 committed by GitHub
commit 88014fcec0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editors/code/.eslintrc.js
View File

@ -12,6 +12,7 @@ module.exports = {
"@typescript-eslint"
],
"rules": {
"camelcase": ["error"],
"@typescript-eslint/member-delimiter-style": [
"error",
{

8
editors/code/src/color_theme.ts
View File

@ -83,11 +83,11 @@ function loadThemeNamed(themeName: string): ColorTheme {
res.mergeFrom(loadThemeFile(themePath));
}
const global_customizations: any = vscode.workspace.getConfiguration('editor').get('tokenColorCustomizations');
res.mergeFrom(ColorTheme.fromRules(global_customizations?.textMateRules ?? []));
const globalCustomizations: any = vscode.workspace.getConfiguration('editor').get('tokenColorCustomizations');
res.mergeFrom(ColorTheme.fromRules(globalCustomizations?.textMateRules ?? []));
const theme_customizations: any = vscode.workspace.getConfiguration('editor.tokenColorCustomizations').get(`[${themeName}]`);
res.mergeFrom(ColorTheme.fromRules(theme_customizations?.textMateRules ?? []));
const themeCustomizations: any = vscode.workspace.getConfiguration('editor.tokenColorCustomizations').get(`[${themeName}]`);
res.mergeFrom(ColorTheme.fromRules(themeCustomizations?.textMateRules ?? []));
return res;

4
editors/code/src/commands/expand_macro.ts
View File

@ -31,7 +31,7 @@ interface ExpandedMacro {
expansion: string;
}
function code_format(expanded: ExpandedMacro): string {
function codeFormat(expanded: ExpandedMacro): string {
let result = `// Recursive expansion of ${expanded.name}! macro\n`;
result += '// ' + '='.repeat(result.length - 3);
result += '\n\n';
@ -65,7 +65,7 @@ class TextDocumentContentProvider
if (expanded == null) return 'Not available';
return code_format(expanded);
return codeFormat(expanded);
}
get onDidChange(): vscode.Event<vscode.Uri> {

1
editors/code/src/installation/fetch_artifact_release_info.ts
View File

@ -46,6 +46,7 @@ export async function fetchArtifactReleaseInfo(
name: string;
assets: Array<{
name: string;
// eslint-disable-next-line camelcase
browser_download_url: string;
}>;
}