Skip to content

Deprecation, Syntax highlighting csslintrc and Beautifying #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 30, 2015
Merged

Deprecation, Syntax highlighting csslintrc and Beautifying #43

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a45faa5
Fix Deprecation Warning
Hirse Jun 29, 2015
abf6aa1
Add Syntax highlighting for .csslintrc
Hirse Jun 29, 2015
e5408d6
Beautify and fix Whitespace
Hirse Jun 29, 2015
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
132 changes: 70 additions & 62 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,82 +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");

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<len; i++) {
for (var i = 0, len = results.messages.length; i < len; i++) {

/*
Currently the Brackets Lint API doesn't work with warnings that are 'document' level.
See bug: https://github.com/adobe/brackets/issues/5452
*/
var messageOb = results.messages[i];
/*
Currently the Brackets Lint API doesn't work with warnings that are 'document' level.
See bug: https://github.com/adobe/brackets/issues/5452
*/
var messageOb = results.messages[i];

if(!messageOb.line) continue;
//default
var type = CodeInspection.Type.WARNING;
if (!messageOb.line) continue;
//default
var type = CodeInspection.Type.WARNING;

if(messageOb.type === "error") {
type = CodeInspection.Type.ERROR;
} else if(messageOb.type === "warning") {
type = CodeInspection.Type.WARNING;
}
if (messageOb.type === "error") {
type = CodeInspection.Type.ERROR;
} else if (messageOb.type === "warning") {
type = CodeInspection.Type.WARNING;
}

var message = messageOb.rule.name + " - " + messageOb.message;
message += " (" + messageOb.rule.id + ")";
var message = messageOb.rule.name + " - " + messageOb.message;
message += " (" + messageOb.rule.id + ")";

result.errors.push({
pos: {line:messageOb.line-1, ch:messageOb.col},
message:message,
result.errors.push({
pos: {
line: messageOb.line - 1,
ch: messageOb.col
},
message: message,

type:type
});
}
type: type
});
}

return result;
} else {
//no errors
return null;
}
return result;
} else {
//no errors
return null;
}

}
}


/**
/**
* Loads project-wide CSSLint configuration.
*
* CSSLint project file should be located at <Project Root>/.csslintrc. It
Expand All @@ -97,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);
Expand All @@ -118,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
Expand All @@ -141,20 +147,22 @@ define(function (require, exports, module) {

AppInit.appReady(function () {

LanguageManager.getLanguage("json").addFileName(_configFileName);

CodeInspection.register("css", {
name: "CSSLint",
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) {
tryLoadConfig();
}
});

$(ProjectManager)
ProjectManager
.on("projectOpen.csslint", function () {
tryLoadConfig();
});
Expand Down