From a45faa5e0d48b16a6427815873ff4a46b5c17ff3 Mon Sep 17 00:00:00 2001 From: Hirse Date: Mon, 29 Jun 2015 23:56:08 +0200 Subject: [PATCH 1/3] Fix Deprecation Warning --- main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main.js b/main.js index acb3b04..0b836e9 100644 --- a/main.js +++ b/main.js @@ -146,7 +146,7 @@ define(function (require, exports, module) { scanFile: cssLinter }); - $(DocumentManager) + DocumentManager .on("documentSaved.csslint documentRefreshed.csslint", function (e, document) { // if this project's .csslintrc config has been updated, reload if (document.file.fullPath === ProjectManager.getProjectRoot().fullPath + _configFileName) { @@ -154,7 +154,7 @@ define(function (require, exports, module) { } }); - $(ProjectManager) + ProjectManager .on("projectOpen.csslint", function () { tryLoadConfig(); }); From abf6aa1634fc361767dd5d9181d135e7e7b73d90 Mon Sep 17 00:00:00 2001 From: Hirse Date: Tue, 30 Jun 2015 00:07:38 +0200 Subject: [PATCH 2/3] Add Syntax highlighting for .csslintrc --- main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/main.js b/main.js index 0b836e9..ec9b64b 100644 --- a/main.js +++ b/main.js @@ -9,7 +9,8 @@ define(function (require, exports, module) { DocumentManager = brackets.getModule("document/DocumentManager"), FileSystem = brackets.getModule("filesystem/FileSystem"), ProjectManager = brackets.getModule("project/ProjectManager"), - PreferencesManager = brackets.getModule("preferences/PreferencesManager"); + PreferencesManager = brackets.getModule("preferences/PreferencesManager"), + LanguageManager = brackets.getModule("language/LanguageManager"); var pm = PreferencesManager.getExtensionPrefs("csslint"), defaults; @@ -141,6 +142,8 @@ define(function (require, exports, module) { AppInit.appReady(function () { + LanguageManager.getLanguage("json").addFileName(_configFileName); + CodeInspection.register("css", { name: "CSSLint", scanFile: cssLinter From e5408d6f709aaf85111bba5729596c160af699e0 Mon Sep 17 00:00:00 2001 From: Hirse Date: Tue, 30 Jun 2015 00:11:57 +0200 Subject: [PATCH 3/3] Beautify and fix Whitespace --- main.js | 129 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 67 insertions(+), 62 deletions(-) diff --git a/main.js b/main.js index ec9b64b..7e85c9b 100644 --- a/main.js +++ b/main.js @@ -1,83 +1,88 @@ /*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */ -/*global define, brackets, $, window, CSSLint, Mustache */ +/*global define, brackets, $, CSSLint */ define(function (require, exports, module) { - 'use strict'; - - var AppInit = brackets.getModule("utils/AppInit"), - CodeInspection = brackets.getModule("language/CodeInspection"), - DocumentManager = brackets.getModule("document/DocumentManager"), - FileSystem = brackets.getModule("filesystem/FileSystem"), - ProjectManager = brackets.getModule("project/ProjectManager"), - PreferencesManager = brackets.getModule("preferences/PreferencesManager"), - LanguageManager = brackets.getModule("language/LanguageManager"); - - var pm = PreferencesManager.getExtensionPrefs("csslint"), - defaults; - - pm.definePreference("options", "object", {}) - .on("change", function () { - defaults = pm.get("options"); - }); + "use strict"; + + var DocumentManager = brackets.getModule("document/DocumentManager"), + FileSystem = brackets.getModule("filesystem/FileSystem"), + CodeInspection = brackets.getModule("language/CodeInspection"), + LanguageManager = brackets.getModule("language/LanguageManager"), + PreferencesManager = brackets.getModule("preferences/PreferencesManager"), + ProjectManager = brackets.getModule("project/ProjectManager"), + AppInit = brackets.getModule("utils/AppInit"); + + var pm = PreferencesManager.getExtensionPrefs("csslint"), + defaults; + + pm.definePreference("options", "object", {}) + .on("change", function () { + defaults = pm.get("options"); + }); - defaults = pm.get("options"); + defaults = pm.get("options"); - require("csslint/csslint"); + require("csslint/csslint"); - var _configFileName = ".csslintrc", - config = {}; + var _configFileName = ".csslintrc", + config = {}; - function cssLinter(text, fullPath) { - var results; + function cssLinter(text) { + var results; - // Merge default CSSLint ruleset with the custom .csslintrc config - var ruleset = $.extend(CSSLint.getRuleset(), defaults, config.options); + // Merge default CSSLint ruleset with the custom .csslintrc config + var ruleset = $.extend(CSSLint.getRuleset(), defaults, config.options); - // Execute CSSLint - results = CSSLint.verify(text, ruleset); + // Execute CSSLint + results = CSSLint.verify(text, ruleset); - if (results.messages.length) { - var result = { errors: [] }; + if (results.messages.length) { + var result = { + errors: [] + }; - for(var i=0, len=results.messages.length; i/.csslintrc. It @@ -98,7 +103,7 @@ define(function (require, exports, module) { file.read(function (err, content) { if (!err) { var cfg = {}; - try { + try { config = JSON.parse(content); } catch (e) { console.error("CSSLint: Error parsing " + file.fullPath + ". Details: " + e); @@ -119,7 +124,7 @@ define(function (require, exports, module) { */ function tryLoadConfig() { /** - * Makes sure JSHint is re-ran when the config is reloaded + * Makes sure CSSLint is re-ran when the config is reloaded * * This is a workaround due to some loading issues in Sprint 31. * See bug for details: https://github.com/adobe/brackets/issues/5442 @@ -157,7 +162,7 @@ define(function (require, exports, module) { } }); - ProjectManager + ProjectManager .on("projectOpen.csslint", function () { tryLoadConfig(); });