From 9b74d12c2e686444362a145e3bf84c9b46084c91 Mon Sep 17 00:00:00 2001 From: Johannes Rieken Date: Fri, 28 Oct 2016 16:31:54 +0200 Subject: [PATCH] also take number of highlight ranges into account, fixes #14660 --- src/vs/editor/contrib/suggest/common/completionModel.ts | 5 +++-- .../contrib/suggest/test/common/completionModel.test.ts | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/vs/editor/contrib/suggest/common/completionModel.ts b/src/vs/editor/contrib/suggest/common/completionModel.ts index a08f54a8d20..5ec672e8ba8 100644 --- a/src/vs/editor/contrib/suggest/common/completionModel.ts +++ b/src/vs/editor/contrib/suggest/common/completionModel.ts @@ -231,12 +231,13 @@ export class CompletionModel { } } - // combine the four scoring values into one + // combine the five scoring values into one // value using base_100. Values further left // are more important return (CompletionModel._base ** 4) * caseSensitiveMatches + (CompletionModel._base ** 3) * caseInsensitiveMatches + (CompletionModel._base ** 2) * (CompletionModel._base - firstMatchStart) - + (CompletionModel._base ** 1) * (CompletionModel._base - notMatching); + + (CompletionModel._base ** 1) * (CompletionModel._base - highlights.length) + + (CompletionModel._base ** 0) * (CompletionModel._base - notMatching); } } diff --git a/src/vs/editor/contrib/suggest/test/common/completionModel.test.ts b/src/vs/editor/contrib/suggest/test/common/completionModel.test.ts index eb98e106325..aaea80dfccd 100644 --- a/src/vs/editor/contrib/suggest/test/common/completionModel.test.ts +++ b/src/vs/editor/contrib/suggest/test/common/completionModel.test.ts @@ -144,5 +144,6 @@ suite('CompletionModel', function () { assertTopScore('editor.R', 1, 'diffEditor.renderSideBySide', 'editor.overviewRulerlanes', 'editor.renderControlCharacter', 'editor.renderWhitespace'); assertTopScore('Editor.r', 0, 'diffEditor.renderSideBySide', 'editor.overviewRulerlanes', 'editor.renderControlCharacter', 'editor.renderWhitespace'); + assertTopScore('-mo', 1, '-ms-ime-mode', '-moz-columns'); }); }); -- GitLab