mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2024-12-21 04:10:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1841 from Carreau/deduplicate_completion

Browse Source 
[notebook] deduplicate completion results

remove context completions that are duplicates from introspection
completion

fixes #1840
This commit is contained in:
Fernando Perez 2012-06-07 20:12:43 -07:00
commit 9ebbfe3f22
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
IPython/frontend/html/notebook/static/js/completer.js
View File

@ -8,9 +8,15 @@ var IPython = (function (IPython) {
// easyier key mapping
var key = IPython.utils.keycodes;
function _existing_completion(item, completion_array){
for( var c in completion_array ) {
if(completion_array[c].substr(-item.length) == item)
{ return true; }
}
return false;
}
// what is the common start of all completions
function shared_start(B) {
if (B.length == 1) {
return B[0];
@ -116,12 +122,19 @@ var IPython = (function (IPython) {
var cur = this.editor.getCursor();
var results = CodeMirror.contextHint(this.editor);
var filterd_results = Array();
//remove results from context completion
//that are already in kernel completion
for(var elm in results) {
if(_existing_completion(results[elm]['str'], matches) == false)
{ filterd_results.push(results[elm]); }
}
// append the introspection result, in order, at at the beginning of
// the table and compute the replacement range from current cursor
// positon and matched_text length.
for (var i = matches.length - 1; i >= 0; --i) {
results.unshift({
filterd_results.unshift({
str: matches[i],
type: "introspection",
from: {
@ -136,7 +149,7 @@ var IPython = (function (IPython) {
}
// one the 2 sources results have been merge, deal with it
this.raw_result = results;
this.raw_result = filterd_results;
// if empty result return
if (!this.raw_result || !this.raw_result.length) return;