Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Change ruff errors to warnings and fix config saving #2246

Merged
merged 1 commit into from
Oct 4, 2024
Merged

fix: Change ruff errors to warnings and fix config saving #2246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions packages/code-studio/src/settings/EditorSectionContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,24 @@ export function EditorSectionContent(): JSX.Element {
(newValue: Record<string, unknown>) => {
dispatch(
updateNotebookSettings({
python: { linter: { ...ruffSettings, config: newValue } },
python: {
linter: {
...ruffSettings,
config:
JSON.stringify(newValue) ===
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the argument mismatch in the JSON.stringify calls intentional?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. I want to check if the value was reset to default here, but the objects won't be the same. The other option was to do this check in the settings modal before onSave is called and then call with null or undefined to indicate the default.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, I misread this. I thought your were passing in undefined, 2 to one of the JSON.stringify calls

JSON.stringify(RUFF_DEFAULT_SETTINGS)
? undefined
: newValue,
},
},
})
);
MonacoProviders.setRuffSettings(newValue);
},
[dispatch, ruffSettings]
);

const [val, setVal] = useState(JSON.stringify(ruffConfig, null, 2));
const val = JSON.stringify(ruffConfig, null, 2);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we memoize this?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it matters. The object isn't that big and there's still some overhead to do the string comparison for memoization. Also the component shouldn't re-render often.


const [isRuffSettingsOpen, setIsRuffSettingsOpen] = useState(false);

Expand All @@ -70,7 +79,6 @@ export function EditorSectionContent(): JSX.Element {
const handleRuffSettingsSave = useCallback(
(v: Record<string, unknown>) => {
handleRuffConfigChange(v);
setVal(JSON.stringify(v, null, 2));
handleRuffSettingsClose();
},
[handleRuffConfigChange, handleRuffSettingsClose]
Expand Down
18 changes: 12 additions & 6 deletions packages/console/src/monaco/MonacoProviders.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,21 +108,25 @@ class MonacoProviders extends PureComponent<
return;
}

const diagnostics = MonacoProviders.getDiagnostics(model);
log.debug(`Linting Python document: ${model.uri.toString()}`, diagnostics);

monaco.editor.setModelMarkers(
model,
'ruff',
MonacoProviders.getDiagnostics(model).map((d: Diagnostic) => {
// Unused variable or import. Mark as warning and unnecessary to fade the text
diagnostics.map((d: Diagnostic) => {
// Unused variable or import. Mark as unnecessary to fade the text
const isUnnecessary = d.code === 'F401' || d.code === 'F841';
const isSyntaxError = d.code == null; // SyntaxError has no error code
return {
startLineNumber: d.location.row,
startColumn: d.location.column,
endLineNumber: d.end_location.row,
endColumn: d.end_location.column,
message: d.code != null ? `${d.code}: ${d.message}` : d.message, // SyntaxError has no code
severity: isUnnecessary
? monaco.MarkerSeverity.Warning
: monaco.MarkerSeverity.Error,
message: isSyntaxError ? d.message : `${d.code}: ${d.message}`,
severity: isSyntaxError
? monaco.MarkerSeverity.Error
: monaco.MarkerSeverity.Warning,
tags: isUnnecessary ? [monaco.MarkerTag.Unnecessary] : [],
};
})
Expand Down Expand Up @@ -374,6 +378,8 @@ class MonacoProviders extends PureComponent<
return;
}

log.debug(`Formatting Python document: ${model.uri.toString}`);

return [
{
range: model.getFullModelRange(),
Expand Down
Loading