Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.
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
26 changes: 15 additions & 11 deletions src/extensions/default/CSSCodeHints/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,21 @@
define(function (require, exports, module) {
"use strict";

var AppInit = brackets.getModule("utils/AppInit"),
ExtensionUtils = brackets.getModule("utils/ExtensionUtils"),
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
CSSUtils = brackets.getModule("language/CSSUtils"),
HTMLUtils = brackets.getModule("language/HTMLUtils"),
LanguageManager = brackets.getModule("language/LanguageManager"),
TokenUtils = brackets.getModule("utils/TokenUtils"),
StringMatch = brackets.getModule("utils/StringMatch"),
ColorUtils = brackets.getModule("utils/ColorUtils"),
CSSProperties = require("text!CSSProperties.json"),
properties = JSON.parse(CSSProperties);
var AppInit = brackets.getModule("utils/AppInit"),
ExtensionUtils = brackets.getModule("utils/ExtensionUtils"),
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
CSSUtils = brackets.getModule("language/CSSUtils"),
HTMLUtils = brackets.getModule("language/HTMLUtils"),
LanguageManager = brackets.getModule("language/LanguageManager"),
PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
TokenUtils = brackets.getModule("utils/TokenUtils"),
StringMatch = brackets.getModule("utils/StringMatch"),
ColorUtils = brackets.getModule("utils/ColorUtils"),
CSSProperties = require("text!CSSProperties.json"),
properties = JSON.parse(CSSProperties);


PreferencesManager.definePreference("codehint.CssPropHints", "boolean", true);

// Context of the last request for hints: either CSSUtils.PROP_NAME,
// CSSUtils.PROP_VALUE or null.
Expand Down
6 changes: 6 additions & 0 deletions src/extensions/default/HTMLCodeHints/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,17 @@ define(function (require, exports, module) {
var AppInit = brackets.getModule("utils/AppInit"),
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
HTMLUtils = brackets.getModule("language/HTMLUtils"),
PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
HTMLTags = require("text!HtmlTags.json"),
HTMLAttributes = require("text!HtmlAttributes.json"),
tags,
attributes;


PreferencesManager.definePreference("codehint.TagHints", "boolean", true);

PreferencesManager.definePreference("codehint.AttrHints", "boolean", true);

/**
* @constructor
*/
Expand Down
6 changes: 5 additions & 1 deletion src/extensions/default/HtmlEntityCodeHints/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,13 @@ define(function (require, exports, module) {
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
ExtensionUtils = brackets.getModule("utils/ExtensionUtils"),
HTMLUtils = brackets.getModule("language/HTMLUtils"),
PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
HtmlSpecialChars = require("text!SpecialChars.json"),
specialChars;


PreferencesManager.definePreference("codehint.SpecialCharHints", "boolean", true);

/**
* Encodes the special Char value given.
*
Expand Down Expand Up @@ -271,4 +275,4 @@ define(function (require, exports, module) {

//Export Hints for Unit Tests
exports.SpecialCharHints = SpecialCharHints;
});
});
2 changes: 2 additions & 0 deletions src/extensions/default/StaticServer/StaticServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ define(function (require, exports, module) {
*/
var _prefs = PreferencesManager.getExtensionPrefs("staticserver");

_prefs.definePreference("port", "number", 0);

/**
* @constructor
* @extends {BaseServer}
Expand Down
22 changes: 13 additions & 9 deletions src/extensions/default/UrlCodeHints/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,26 @@ define(function (require, exports, module) {
"use strict";

// Brackets modules
var AppInit = brackets.getModule("utils/AppInit"),
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
CSSUtils = brackets.getModule("language/CSSUtils"),
FileSystem = brackets.getModule("filesystem/FileSystem"),
FileUtils = brackets.getModule("file/FileUtils"),
HTMLUtils = brackets.getModule("language/HTMLUtils"),
ProjectManager = brackets.getModule("project/ProjectManager"),
StringUtils = brackets.getModule("utils/StringUtils"),
var AppInit = brackets.getModule("utils/AppInit"),
CodeHintManager = brackets.getModule("editor/CodeHintManager"),
CSSUtils = brackets.getModule("language/CSSUtils"),
FileSystem = brackets.getModule("filesystem/FileSystem"),
FileUtils = brackets.getModule("file/FileUtils"),
HTMLUtils = brackets.getModule("language/HTMLUtils"),
PreferencesManager = brackets.getModule("preferences/PreferencesManager"),
ProjectManager = brackets.getModule("project/ProjectManager"),
StringUtils = brackets.getModule("utils/StringUtils"),

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

urlHints,
data,
htmlAttrs,
styleModes = ["css", "text/x-less", "text/x-scss"];



PreferencesManager.definePreference("codehint.UrlCodeHints", "boolean", true);

/**
* @constructor
*/
Expand Down
6 changes: 5 additions & 1 deletion src/language/CodeInspection.js
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,11 @@ define(function (require, exports, module) {
});

prefs.definePreference(PREF_ASYNC_TIMEOUT, "number", 10000);


prefs.definePreference(PREF_PREFER_PROVIDERS, "array", []);

prefs.definePreference(PREF_PREFERRED_ONLY, "boolean", false);

// Initialize items dependent on HTML DOM
AppInit.htmlReady(function () {
// Create bottom panel to list error details
Expand Down