YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #403 from nonameShijian/PR-Branch 

fix startScroll == undfined,增加原型链的代码提示
This commit is contained in:
Spmario233 2023-09-27 15:01:14 +08:00 committed by GitHub
parent 0ad723d2db 97a8442ba4
commit b11198a6f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/codemirror.js
View File

@ -10259,6 +10259,8 @@
}
cm.on("scroll", this.onScroll = function () {
// fix "startScroll == undfined"
if (!startScroll) return;
var curScroll = cm.getScrollInfo(), editor = cm.getWrapperElement().getBoundingClientRect();
var newTop = top + startScroll.top - curScroll.top;
var point = newTop - (parentWindow.pageYOffset || (ownerDocument.documentElement || ownerDocument.body).scrollTop);

14
game/game.js
View File

@ -7506,8 +7506,7 @@
//覆盖原本的javascript提示
CodeMirror.registerHelper('hint','javascript',(editor,options)=>{
//Find the token at the cursor
let cur=editor.getCursor(),
token=editor.getTokenAt(cur);
let cur=editor.getCursor(),token=editor.getTokenAt(cur);
if(/\b(?:string|comment)\b/.test(token.type)) return;
const innerMode=CodeMirror.innerMode(editor.getMode(),token.state);
if (innerMode.mode.helperType==="json") return;
@ -7523,10 +7522,9 @@
};
}else if(token.end>cur.ch){
token.end=cur.ch;
token.string=token.string.slice(0,cur.ch- oken.start);
token.string=token.string.slice(0,cur.ch-token.start);
}
let tprop=token;
let context;
let tprop=token,context;
//If it is a property, find out what it is a property of.
while (tprop.type=="property"){
tprop=editor.getTokenAt(CodeMirror.Pos(cur.line,tprop.start));
@ -7540,8 +7538,10 @@
try {
const code=context.length==1?context[0].string:context.reduceRight((pre,cur)=>(pre.string||pre)+'.'+cur.string);
const obj=eval(code);
const keys=Object.getOwnPropertyNames(obj).filter(key=>key.startsWith(token.string));
list.addArray(keys);
if(![null,undefined].includes(obj)){
const keys=Object.getOwnPropertyNames(obj).concat(Object.getOwnPropertyNames(Object.getPrototypeOf(obj))).filter(key=>key.startsWith(token.string));
list.addArray(keys);
}
}catch(_){ return;}
}else if(token&&typeof token.string=='string'){
const javascriptKeywords=("break case catch class const continue debugger default delete do else export extends from false finally for function " +