Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.

Commit 254927f

Browse files
committed
Merge pull request #11197 from adobe/marcel/define-preferences
Define all preferences in core
2 parents 0b17978 + 94e9138 commit 254927f

File tree

6 files changed

+46
-22
lines changed

6 files changed

+46
-22
lines changed

src/extensions/default/CSSCodeHints/main.js

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,21 @@
2727
define(function (require, exports, module) {
2828
"use strict";
2929

30-
var AppInit = brackets.getModule("utils/AppInit"),
31-
ExtensionUtils = brackets.getModule("utils/ExtensionUtils"),
32-
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
33-
CSSUtils = brackets.getModule("language/CSSUtils"),
34-
HTMLUtils = brackets.getModule("language/HTMLUtils"),
35-
LanguageManager = brackets.getModule("language/LanguageManager"),
36-
TokenUtils = brackets.getModule("utils/TokenUtils"),
37-
StringMatch = brackets.getModule("utils/StringMatch"),
38-
ColorUtils = brackets.getModule("utils/ColorUtils"),
39-
CSSProperties = require("text!CSSProperties.json"),
40-
properties = JSON.parse(CSSProperties);
30+
var AppInit = brackets.getModule("utils/AppInit"),
31+
ExtensionUtils = brackets.getModule("utils/ExtensionUtils"),
32+
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
33+
CSSUtils = brackets.getModule("language/CSSUtils"),
34+
HTMLUtils = brackets.getModule("language/HTMLUtils"),
35+
LanguageManager = brackets.getModule("language/LanguageManager"),
36+
PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
37+
TokenUtils = brackets.getModule("utils/TokenUtils"),
38+
StringMatch = brackets.getModule("utils/StringMatch"),
39+
ColorUtils = brackets.getModule("utils/ColorUtils"),
40+
CSSProperties = require("text!CSSProperties.json"),
41+
properties = JSON.parse(CSSProperties);
42+
43+
44+
PreferencesManager.definePreference("codehint.CssPropHints", "boolean", true);
4145

4246
// Context of the last request for hints: either CSSUtils.PROP_NAME,
4347
// CSSUtils.PROP_VALUE or null.

src/extensions/default/HTMLCodeHints/main.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,17 @@ define(function (require, exports, module) {
3232
var AppInit = brackets.getModule("utils/AppInit"),
3333
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
3434
HTMLUtils = brackets.getModule("language/HTMLUtils"),
35+
PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
3536
HTMLTags = require("text!HtmlTags.json"),
3637
HTMLAttributes = require("text!HtmlAttributes.json"),
3738
tags,
3839
attributes;
3940

41+
42+
PreferencesManager.definePreference("codehint.TagHints", "boolean", true);
43+
44+
PreferencesManager.definePreference("codehint.AttrHints", "boolean", true);
45+
4046
/**
4147
* @constructor
4248
*/

src/extensions/default/HtmlEntityCodeHints/main.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,13 @@ define(function (require, exports, module) {
3333
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
3434
ExtensionUtils = brackets.getModule("utils/ExtensionUtils"),
3535
HTMLUtils = brackets.getModule("language/HTMLUtils"),
36+
PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
3637
HtmlSpecialChars = require("text!SpecialChars.json"),
3738
specialChars;
3839

40+
41+
PreferencesManager.definePreference("codehint.SpecialCharHints", "boolean", true);
42+
3943
/**
4044
* Encodes the special Char value given.
4145
*
@@ -271,4 +275,4 @@ define(function (require, exports, module) {
271275

272276
//Export Hints for Unit Tests
273277
exports.SpecialCharHints = SpecialCharHints;
274-
});
278+
});

src/extensions/default/StaticServer/StaticServer.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ define(function (require, exports, module) {
4141
*/
4242
var _prefs = PreferencesManager.getExtensionPrefs("staticserver");
4343

44+
_prefs.definePreference("port", "number", 0);
45+
4446
/**
4547
* @constructor
4648
* @extends {BaseServer}

src/extensions/default/UrlCodeHints/main.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,26 @@ define(function (require, exports, module) {
2828
"use strict";
2929

3030
// Brackets modules
31-
var AppInit = brackets.getModule("utils/AppInit"),
32-
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
33-
CSSUtils = brackets.getModule("language/CSSUtils"),
34-
FileSystem = brackets.getModule("filesystem/FileSystem"),
35-
FileUtils = brackets.getModule("file/FileUtils"),
36-
HTMLUtils = brackets.getModule("language/HTMLUtils"),
37-
ProjectManager = brackets.getModule("project/ProjectManager"),
38-
StringUtils = brackets.getModule("utils/StringUtils"),
31+
var AppInit = brackets.getModule("utils/AppInit"),
32+
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
33+
CSSUtils = brackets.getModule("language/CSSUtils"),
34+
FileSystem = brackets.getModule("filesystem/FileSystem"),
35+
FileUtils = brackets.getModule("file/FileUtils"),
36+
HTMLUtils = brackets.getModule("language/HTMLUtils"),
37+
PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
38+
ProjectManager = brackets.getModule("project/ProjectManager"),
39+
StringUtils = brackets.getModule("utils/StringUtils"),
3940

4041
Data = require("text!data.json"),
4142

4243
urlHints,
4344
data,
4445
htmlAttrs,
4546
styleModes = ["css", "text/x-less", "text/x-scss"];
46-
47+
48+
49+
PreferencesManager.definePreference("codehint.UrlCodeHints", "boolean", true);
50+
4751
/**
4852
* @constructor
4953
*/

src/language/CodeInspection.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,11 @@ define(function (require, exports, module) {
609609
});
610610

611611
prefs.definePreference(PREF_ASYNC_TIMEOUT, "number", 10000);
612-
612+
613+
prefs.definePreference(PREF_PREFER_PROVIDERS, "array", []);
614+
615+
prefs.definePreference(PREF_PREFERRED_ONLY, "boolean", false);
616+
613617
// Initialize items dependent on HTML DOM
614618
AppInit.htmlReady(function () {
615619
// Create bottom panel to list error details

0 commit comments

Comments
 (0)