Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/mode/golang_highlight_rules.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ var oop = require("../lib/oop");
"select|type|var"
);
var builtinTypes = (
"string|uint8|uint16|uint32|uint64|int8|int16|int32|int64|float32|" +
"float64|complex64|complex128|byte|rune|uint|int|uintptr|bool|error"
"any|string|uint8|uint16|uint32|uint64|int8|int16|int32|int64|float32|" +
"float64|complex64|complex128|byte|rune|uint|int|uintptr|bool|error|comparable"
);
var builtinFunctions = (
"new|close|cap|copy|panic|panicln|print|println|len|make|delete|real|recover|imag|append"
Expand Down
10 changes: 10 additions & 0 deletions src/mode/golang_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@ module.exports = {
this.mode = new GolangMode();
},

"test: predeclared types added in Go 1.18" : function() {
var tokenizer = this.mode.getTokenizer();
function typeOf(line, index) {
return tokenizer.getLineTokens(line, "start").tokens[index].type;
}
assert.equal("support.type", typeOf("var x any", 4));
assert.equal("support.type", typeOf("type S[E comparable] int", 6));
assert.equal("support.type", typeOf("var e error", 4));
},

"test: trigger outdent if line is space and new text starts with closing brace or paren" : function() {
assert.ok(this.mode.checkOutdent("start", " ", " }"));
assert.ok(this.mode.checkOutdent("start", " ", " )"));
Expand Down
Loading