Skip to content

Commit

Permalink
Merge branch 'master' into dts-generator
Browse files Browse the repository at this point in the history
# Conflicts:
#	ace.d.ts
  • Loading branch information
mkslanc committed Nov 23, 2024
2 parents b0f9f2c + b3625f3 commit a2122ec
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/mode/java.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ var Mode = function() {
JavaScriptMode.call(this);
this.HighlightRules = JavaHighlightRules;
this.foldingRules = new JavaFoldMode();
this.$behaviour = this.$defaultBehaviour;
};
oop.inherits(Mode, JavaScriptMode);

Expand Down
1 change: 1 addition & 0 deletions src/mode/scala.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var ScalaHighlightRules = require("./scala_highlight_rules").ScalaHighlightRules
var Mode = function() {
JavaScriptMode.call(this);
this.HighlightRules = ScalaHighlightRules;
this.$behaviour = this.$defaultBehaviour;
};
oop.inherits(Mode, JavaScriptMode);

Expand Down
1 change: 1 addition & 0 deletions src/mode/wollok.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ var WollokHighlightRules = require("./wollok_highlight_rules").WollokHighlightRu
var Mode = function() {
JavaScriptMode.call(this);
this.HighlightRules = WollokHighlightRules;
this.$behaviour = this.$defaultBehaviour;
};
oop.inherits(Mode, JavaScriptMode);

Expand Down

0 comments on commit a2122ec

Please sign in to comment.