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

Jump to bottom

Allow tab completing users in brackets #28460

Merged
merged 2 commits into from
Nov 15, 2024
Merged

Allow tab completing users in brackets #28460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62b173a
Allow tab completing users in brackets
t3chguy Nov 14, 2024
572afd7
Account for range offsets when tab completing to not replace unrelate…
t3chguy Nov 14, 2024
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: 1 addition & 1 deletion src/autocomplete/UserProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const USER_REGEX = /\B@\S*/g;

// used when you hit 'tab' - we allow some separator chars at the beginning
// to allow you to tab-complete /mat into /(matthew)
const FORCED_USER_REGEX = /[^/,:; \t\n]\S*/g;
const FORCED_USER_REGEX = /[^/,.():; \t\n]\S*/g;

export default class UserProvider extends AutocompleteProvider {
public matcher: QueryMatcher<RoomMember>;
Expand Down
4 changes: 3 additions & 1 deletion src/editor/autocomplete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ import { KeyboardEvent } from "react";

import { Part, CommandPartCreator, PartCreator } from "./parts";
import DocumentPosition from "./position";
import { ICompletion } from "../autocomplete/Autocompleter";
import { ICompletion, ISelectionRange } from "../autocomplete/Autocompleter";
import Autocomplete from "../components/views/rooms/Autocomplete";

export interface ICallback {
replaceParts?: Part[];
range?: ISelectionRange;
close?: boolean;
}

Expand Down Expand Up @@ -82,6 +83,7 @@ export default class AutocompleteWrapperModel {
this.updateCallback({
replaceParts: this.partForCompletion(completion),
close: true,
range: completion.range,
});
}

Expand Down
16 changes: 13 additions & 3 deletions src/editor/model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,14 +250,24 @@ export default class EditorModel {
return Promise.resolve();
}

private onAutoComplete = ({ replaceParts, close }: ICallback): void => {
private onAutoComplete = ({ replaceParts, close, range }: ICallback): void => {
let pos: DocumentPosition | undefined;
if (replaceParts) {
const autoCompletePartIdx = this.autoCompletePartIdx || 0;
this._parts.splice(autoCompletePartIdx, this.autoCompletePartCount, ...replaceParts);

this.replaceRange(
new DocumentPosition(autoCompletePartIdx, range?.start ?? 0),
new DocumentPosition(
autoCompletePartIdx + this.autoCompletePartCount - 1,
range?.end ?? this.parts[autoCompletePartIdx + this.autoCompletePartCount - 1].text.length,
),
replaceParts,
);

this.autoCompletePartCount = replaceParts.length;
const lastPart = replaceParts[replaceParts.length - 1];
const lastPartIndex = autoCompletePartIdx + replaceParts.length - 1;
// `replaceRange` merges adjacent parts so we need to find it in the new parts list
const lastPartIndex = this.parts.indexOf(lastPart);
pos = new DocumentPosition(lastPartIndex, lastPart.text.length);
}
if (close) {
Expand Down
Loading