mirror of
https://github.com/compiler-explorer/compiler-explorer.git
synced 2025-12-27 10:33:59 -05:00
Bump all minor versions - npm update; also bump webpack version speculatively... (#4851)
also npm lint and format to make sure any changes turn up.
This commit is contained in:
@@ -314,11 +314,15 @@ class DotNetCompiler extends BaseCompiler {
|
||||
await this.ensureCrossgen2Version(execOptions);
|
||||
|
||||
const crossgen2Options = [
|
||||
'-r', path.join(bclPath, '/'),
|
||||
'-r',
|
||||
path.join(bclPath, '/'),
|
||||
dllPath,
|
||||
'-o', 'CompilerExplorer.r2r.dll',
|
||||
'--codegenopt', (this.sdkMajorVersion < 7 ? 'NgenDisasm=*' : 'JitDisasm=*'),
|
||||
'--codegenopt', (this.sdkMajorVersion < 8 ? 'JitDiffableDasm=1' : 'JitDisasmDiffable=1'),
|
||||
'-o',
|
||||
'CompilerExplorer.r2r.dll',
|
||||
'--codegenopt',
|
||||
this.sdkMajorVersion < 7 ? 'NgenDisasm=*' : 'JitDisasm=*',
|
||||
'--codegenopt',
|
||||
this.sdkMajorVersion < 8 ? 'JitDiffableDasm=1' : 'JitDisasmDiffable=1',
|
||||
'--inputbubble',
|
||||
'--compilebubblegenerics',
|
||||
].concat(options);
|
||||
|
||||
@@ -31,12 +31,12 @@ import type {
|
||||
ResultLine,
|
||||
ResultLineTag,
|
||||
} from '../../types/resultline/resultline.interfaces.js';
|
||||
import type { Artifact, ToolResult } from '../../types/tool.interfaces.js';
|
||||
import type {Artifact, ToolResult} from '../../types/tool.interfaces.js';
|
||||
import * as utils from '../utils.js';
|
||||
|
||||
import { BaseTool } from './base-tool.js';
|
||||
import { ToolEnv } from './base-tool.interface.js';
|
||||
import { ToolInfo } from '../../types/tool.interfaces.js';
|
||||
import {BaseTool} from './base-tool.js';
|
||||
import {ToolEnv} from './base-tool.interface.js';
|
||||
import {ToolInfo} from '../../types/tool.interfaces.js';
|
||||
|
||||
export class SonarTool extends BaseTool {
|
||||
reproducer?: Artifact;
|
||||
@@ -96,7 +96,7 @@ export class SonarTool extends BaseTool {
|
||||
tag: cetag,
|
||||
});
|
||||
if (fixes.length > 0) {
|
||||
output.push({ text: '\t\u21B3 \u001B[3m\uD83D\uDCA1 A Quick Fix is available for this issue\u001B[0m' });
|
||||
output.push({text: '\t\u21B3 \u001B[3m\uD83D\uDCA1 A Quick Fix is available for this issue\u001B[0m'});
|
||||
}
|
||||
if (flow.length > 0) {
|
||||
output.push(
|
||||
@@ -107,7 +107,7 @@ export class SonarTool extends BaseTool {
|
||||
})),
|
||||
);
|
||||
}
|
||||
output.push({ text: `\t\u001B[2m\u21B3 ${this.makeURL(tag.ruleKey)}\u001B[0m` });
|
||||
output.push({text: `\t\u001B[2m\u21B3 ${this.makeURL(tag.ruleKey)}\u001B[0m`});
|
||||
}
|
||||
|
||||
simplifyPathes(lines: string, inputFilepath?: string, pathPrefix?: string): string {
|
||||
@@ -120,23 +120,19 @@ export class SonarTool extends BaseTool {
|
||||
return lines;
|
||||
}
|
||||
|
||||
parseOutputAndFixes(
|
||||
lines: string,
|
||||
inputFilepath?: string,
|
||||
pathPrefix?: string,
|
||||
): ResultLine[] {
|
||||
parseOutputAndFixes(lines: string, inputFilepath?: string, pathPrefix?: string): ResultLine[] {
|
||||
if (!lines) return [];
|
||||
let output: ResultLine[] = [];
|
||||
try {
|
||||
const results = JSON.parse(this.simplifyPathes(lines, inputFilepath, pathPrefix));
|
||||
if (results.header) {
|
||||
output.push(
|
||||
...utils.splitLines('\u001B[3m\u001B[32m' + results.header + '\u001B[0m').map(s => ({ text: s })),
|
||||
...utils.splitLines('\u001B[3m\u001B[32m' + results.header + '\u001B[0m').map(s => ({text: s})),
|
||||
);
|
||||
}
|
||||
if (results.parsingErrors && results.parsingErrors.length > 0) {
|
||||
output.push(
|
||||
{ text: '' },
|
||||
{text: ''},
|
||||
{
|
||||
text:
|
||||
'\u001B[1m\u26A0\uFE0F ' +
|
||||
@@ -148,19 +144,19 @@ export class SonarTool extends BaseTool {
|
||||
}
|
||||
}
|
||||
if (results.issues && results.issues.length > 0) {
|
||||
output.push({ text: '' }, { text: '\u001B[1m\uD83D\uDC1E Issues:\u001B[0m' });
|
||||
output.push({text: ''}, {text: '\u001B[1m\uD83D\uDC1E Issues:\u001B[0m'});
|
||||
for (const e of results.issues) {
|
||||
this.readTag(e, output, 4);
|
||||
}
|
||||
output.push({ text: '' });
|
||||
output.push({text: ''});
|
||||
} else if (!results.parsingErrors || results.parsingErrors.length === 0) {
|
||||
output.push({ text: '' }, { text: '\u001B[1m\u2728 No issue found\u001B[0m' });
|
||||
output.push({text: ''}, {text: '\u001B[1m\u2728 No issue found\u001B[0m'});
|
||||
}
|
||||
if (results.logs && results.logs.length > 0) {
|
||||
output.push(
|
||||
{ text: '' },
|
||||
{ text: '\u001B[1m\uD83D\uDCDC Logs:\u001B[0m' },
|
||||
...results.logs.map(l => ({ text: `[${l.level}] ${l.message}` })),
|
||||
{text: ''},
|
||||
{text: '\u001B[1m\uD83D\uDCDC Logs:\u001B[0m'},
|
||||
...results.logs.map(l => ({text: `[${l.level}] ${l.message}`})),
|
||||
);
|
||||
}
|
||||
if (results.reproducer) {
|
||||
@@ -172,7 +168,7 @@ export class SonarTool extends BaseTool {
|
||||
};
|
||||
}
|
||||
} catch (err) {
|
||||
output = utils.splitLines(lines).map(l => ({ text: l }));
|
||||
output = utils.splitLines(lines).map(l => ({text: l}));
|
||||
}
|
||||
return output;
|
||||
}
|
||||
@@ -197,19 +193,18 @@ export class SonarTool extends BaseTool {
|
||||
return cmd.concat(compileFlags);
|
||||
}
|
||||
|
||||
override async runTool(compilationInfo: Record<any, any>, inputFilePath?: string, args?: string[])
|
||||
: Promise<ToolResult> {
|
||||
override async runTool(
|
||||
compilationInfo: Record<any, any>,
|
||||
inputFilePath?: string,
|
||||
args?: string[],
|
||||
): Promise<ToolResult> {
|
||||
if (inputFilePath == null) {
|
||||
return new Promise(resolve => {
|
||||
resolve(this.createErrorResponse('Unable to run tool'));
|
||||
});
|
||||
}
|
||||
this.reproducer = undefined;
|
||||
let sonarArgs: string[] = [
|
||||
'--directory',
|
||||
path.dirname(inputFilePath),
|
||||
'--',
|
||||
];
|
||||
let sonarArgs: string[] = ['--directory', path.dirname(inputFilePath), '--'];
|
||||
sonarArgs = sonarArgs.concat(this.buildCompilationCMD(compilationInfo, inputFilePath));
|
||||
|
||||
const res: ToolResult = await super.runTool(compilationInfo, inputFilePath, sonarArgs);
|
||||
|
||||
2269
package-lock.json
generated
2269
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -1160,9 +1160,7 @@ function definition(): monaco.languages.IMonarchLanguage {
|
||||
[/(')(.*)(')/, ['string', 'string', 'string']],
|
||||
],
|
||||
|
||||
comment: [
|
||||
[/(.{6}\*.*)([\n])/, ['comment', '@pop']],
|
||||
],
|
||||
comment: [[/(.{6}\*.*)([\n])/, ['comment', '@pop']]],
|
||||
|
||||
whitespace: [
|
||||
[/.{6}\*.*$/, 'comment'],
|
||||
|
||||
@@ -56,7 +56,7 @@ const hasGit = fs.existsSync(path.resolve(__dirname, '.git'));
|
||||
// Hack alert: due to a variety of issues, sometimes we need to change
|
||||
// the name here. Mostly it's things like webpack changes that affect
|
||||
// how minification is done, even though that's supposed not to matter.
|
||||
const webjackJsHack = '.v20.';
|
||||
const webjackJsHack = '.v21.';
|
||||
const plugins: Webpack.WebpackPluginInstance[] = [
|
||||
new MonacoEditorWebpackPlugin({
|
||||
languages: [
|
||||
|
||||
Reference in New Issue
Block a user