development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-09-19 18:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small tweaks

Browse source
This commit is contained in:
Alex Dima 2017-10-17 17:56:03 +02:00
parent 1262a98240
commit 4616b4ccde
2 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/vs/editor/contrib/find/common/findDecorations.ts
View file

@ -68,11 +68,21 @@ export class FindDecorations implements IDisposable {
this.setCurrentFindMatch(null);
}
private _getDecorationIndex(decorationId: string): number {
const index = this._decorations.indexOf(decorationId);
if (index >= 0) {
return index + 1;
}
return 1;
}
public getCurrentMatchesPosition(desiredRange: Range): number {
for (let i = 0, len = this._decorations.length; i < len; i++) {
let range = this._editor.getModel().getDecorationRange(this._decorations[i]);
if (desiredRange.equalsRange(range)) {
return (i + 1);
let candidates = this._editor.getModel().getDecorationsInRange(desiredRange);
for (let i = 0, len = candidates.length; i < len; i++) {
const candidate = candidates[i];
const candidateOpts = candidate.options;
if (candidateOpts === FindDecorations._FIND_MATCH_DECORATION || candidateOpts === FindDecorations._CURRENT_FIND_MATCH_DECORATION) {
return this._getDecorationIndex(candidate.id);
}
}
return 1;
@ -95,12 +105,12 @@ export class FindDecorations implements IDisposable {
if (this._highlightedDecorationId !== null || newCurrentDecorationId !== null) {
this._editor.changeDecorations((changeAccessor: editorCommon.IModelDecorationsChangeAccessor) => {
if (this._highlightedDecorationId !== null) {
changeAccessor.changeDecorationOptions(this._highlightedDecorationId, FindDecorations.createFindMatchDecorationOptions(false));
changeAccessor.changeDecorationOptions(this._highlightedDecorationId, FindDecorations._FIND_MATCH_DECORATION);
this._highlightedDecorationId = null;
}
if (newCurrentDecorationId !== null) {
this._highlightedDecorationId = newCurrentDecorationId;
changeAccessor.changeDecorationOptions(this._highlightedDecorationId, FindDecorations.createFindMatchDecorationOptions(true));
changeAccessor.changeDecorationOptions(this._highlightedDecorationId, FindDecorations._CURRENT_FIND_MATCH_DECORATION);
}
if (this._rangeHighlightDecorationId !== null) {
changeAccessor.removeDecoration(this._rangeHighlightDecorationId);
@ -121,13 +131,14 @@ export class FindDecorations implements IDisposable {
return matchPosition;
}
public set(matches: Range[], findScope: Range): void {
let newDecorations: editorCommon.IModelDeltaDecoration[] = matches.map((match) => {
return {
range: match,
options: FindDecorations.createFindMatchDecorationOptions(false)
public set(findMatches: editorCommon.FindMatch[], findScope: Range): void {
let newDecorations: editorCommon.IModelDeltaDecoration[] = new Array<editorCommon.IModelDeltaDecoration>(findMatches.length);
for (let i = 0, len = findMatches.length; i < len; i++) {
newDecorations[i] = {
range: findMatches[i].range,
options: FindDecorations._FIND_MATCH_DECORATION
};
});
}
if (findScope) {
newDecorations.unshift({
range: findScope,
@ -158,10 +169,6 @@ export class FindDecorations implements IDisposable {
return result;
}
private static createFindMatchDecorationOptions(isCurrent: boolean): ModelDecorationOptions {
return (isCurrent ? this._CURRENT_FIND_MATCH_DECORATION : this._FIND_MATCH_DECORATION);
}
private static _CURRENT_FIND_MATCH_DECORATION = ModelDecorationOptions.register({
stickiness: editorCommon.TrackedRangeStickiness.NeverGrowsWhenTypingAtEdges,
className: 'currentFindMatch',

2
src/vs/editor/contrib/find/common/findModel.ts
View file

@ -171,7 +171,7 @@ export class FindModelBoundToEditorModel {
}
let findMatches = this._findMatches(findScope, false, MATCHES_LIMIT);
this._decorations.set(findMatches.map(match => match.range), findScope);
this._decorations.set(findMatches, findScope);
this._state.changeMatchInfo(
this._decorations.getCurrentMatchesPosition(this._editor.getSelection()),