maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use plaintext language mode for log messages, otherwise respect underlying editor mode

Browse source 
fixes #125619
This commit is contained in:
isidor 2021-06-10 17:15:51 +02:00
parent 85bf591c58
commit 286e555ae1
No known key found for this signature in database
GPG key ID: F9280366A8370105
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vs/workbench/contrib/debug/browser/breakpointWidget.ts
View file

@ -37,6 +37,7 @@ import { IRange, Range } from 'vs/editor/common/core/range';
import { onUnexpectedError } from 'vs/base/common/errors';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IEditorOptions, EditorOption } from 'vs/editor/common/config/editorOptions';
import { PLAINTEXT_LANGUAGE_IDENTIFIER } from 'vs/editor/common/modes/modesRegistry';
const $ = dom.$;
const IPrivateBreakpointWidgetService = createDecorator<IPrivateBreakpointWidgetService>('privateBreakpointWidgetService');
@ -166,6 +167,14 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
}
}
private setInputMode(): void {
if (this.editor.hasModel()) {
// Use plaintext language mode for log messages, otherwise respect underlying editor mode #125619
const languageIdentifier = this.context === Context.LOG_MESSAGE ? PLAINTEXT_LANGUAGE_IDENTIFIER : this.editor.getModel().getLanguageIdentifier();
this.input.getModel().setMode(languageIdentifier);
}
}
override show(rangeOrPos: IRange | IPosition): void {
const lineNum = this.input.getModel().getLineCount();
super.show(rangeOrPos, lineNum + 1);
@ -185,6 +194,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
selectBox.onDidSelect(e => {
this.rememberInput();
this.context = e.index;
this.setInputMode();
const value = this.getInputValue(this.breakpoint);
this.input.getModel().setValue(value);
@ -225,6 +235,7 @@ export class BreakpointWidget extends ZoneWidget implements IPrivateBreakpointWi
model.setMode(this.editor.getModel().getLanguageIdentifier());
}
this.input.setModel(model);
this.setInputMode();
this.toDispose.push(model);
const setDecorations = () => {
const value = this.input.getModel().getValue();