Skip to content

Commit 0dc17e6

Browse files
committed
remove global builtins
1 parent 7a41213 commit 0dc17e6

2 files changed

Lines changed: 13 additions & 8 deletions

File tree

DefoldDocs/api/built-ins.lua

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---Built-ins API documentation
22
---Built-in scripting functions.
3-
---@class builtins
4-
builtins = {}
3+
54
---All ids in the engine are represented as hashes, so a string needs to be hashed
65
---before it can be compared with an id.
76
---@param s string string to hash
@@ -23,5 +22,3 @@ function pprint(v) end
2322

2423

2524

26-
27-
return builtins

src/main/java/LuaBuilder.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,20 @@ private void buildParameterModel(ParameterModel pm, StringBuilder sb, HtmlToPlai
3636

3737

3838
public String build(DocModel docModel) {
39+
//do not add global builtins table
40+
boolean isBuiltins = docModel.getInfoModel().getNamespace().equals("builtins");
3941
StringBuilder sb = new StringBuilder();
4042
StringBuilder inlineTables = new StringBuilder().append("\n");
4143
HtmlToPlainText f = new HtmlToPlainText();
4244
sb.append("---").append(f.getPlainText(docModel.getInfoModel().getBrief())).append("\n");
4345
sb.append("---").append(f.getPlainText(docModel.getInfoModel().getDescription())).append("\n");
44-
sb.append("---@class ").append(docModel.getInfoModel().getNamespace()).append("\n");
45-
sb.append("").append(docModel.getInfoModel().getNamespace()).append(" = {}").append("\n");
46+
if(!isBuiltins){
47+
sb.append("---@class ").append(docModel.getInfoModel().getNamespace()).append("\n");
48+
sb.append("").append(docModel.getInfoModel().getNamespace()).append(" = {}").append("\n");
49+
}else{
50+
sb.append("\n");
51+
}
52+
4653
docModel.getElements().sort(Comparator.naturalOrder());
4754
for (ElementModel em : docModel.getElements()) {
4855
if (em.getType().equals("FUNCTION")) {
@@ -92,8 +99,9 @@ public String build(DocModel docModel) {
9299
}
93100

94101
sb.append(inlineTables.toString()).append("\n");
95-
96-
sb.append("\n").append("return ").append(docModel.getInfoModel().getNamespace());
102+
if(!isBuiltins){
103+
sb.append("\n").append("return ").append(docModel.getInfoModel().getNamespace());
104+
}
97105
return sb.toString();
98106
}
99107

0 commit comments

Comments
 (0)