Skip to content

diffr web: create file models without a language selection #1096

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

Open
milanb17 wants to merge 1 commit into
base: claude/project-thread-hwb7l0
Choose a base branch
from
Open

diffr web: create file models without a language selection #1096

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
11 changes: 3 additions & 8 deletions apps/diffr-web/src/review/services/reviewFilesDiffView.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ import {
IDiffEditorOptions,
} from "vs/editor/common/config/editorOptions.js";
import { Range } from "vs/editor/common/core/range.js";
import { ILanguageService } from "vs/editor/common/languages/language.js";
import { PLAINTEXT_LANGUAGE_ID } from "vs/editor/common/languages/modesRegistry.js";
import { IModelService } from "vs/editor/common/services/model.js";
import { IHoverService } from "vs/platform/hover/browser/hover.js";
import { IInstantiationService } from "vs/platform/instantiation/common/instantiation.js";
Expand Down Expand Up @@ -138,7 +136,6 @@ export class ReviewFilesEditorInput extends Disposable {
/** Whether long lines wrap, in every file. */
private readonly wordWrap: IObservable<boolean>,
@IModelService private readonly modelService: IModelService,
@ILanguageService private readonly languageService: ILanguageService,
@IInstantiationService
private readonly instantiationService: IInstantiationService,
) {
Expand Down Expand Up @@ -181,14 +178,12 @@ export class ReviewFilesEditorInput extends Disposable {
const diff = this.session.getFileResult(entry.file.path)?.diff;
if (!diff) return undefined;
const store = new DisposableStore();
// Plain text without a language selection: diffr's decorations colour the code, and a
// selection would subscribe every model to the language service.
const model = (uri: URI, text: string) =>
store.add(
this.modelService.getModel(uri) ??
this.modelService.createModel(
text,
this.languageService.createById(PLAINTEXT_LANGUAGE_ID),
uri,
),
this.modelService.createModel(text, null, uri),
);
const text = (side: "lhs" | "rhs") =>
diff.type === "text" ? (diff[side]?.text ?? "") : "";
Expand Down
Loading