Skip to content

Commit

Permalink
Merge pull request adobe#4588 from adobe/pflynn/pluggable-linting
Browse files Browse the repository at this point in the history
Pluggable linting
  • Loading branch information
peterflynn committed Sep 7, 2013
2 parents 13d785c + 3dd1b3f commit db4e426
Show file tree
Hide file tree
Showing 20 changed files with 493 additions and 360 deletions.
9 changes: 9 additions & 0 deletions src/base-config/keyboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,15 @@
"navigate.jumptoDefinition": [
"Ctrl-J"
],
"navigate.gotoFirstProblem": [
{
"key": "F8"
},
{
"key": "Cmd-'",
"platform": "mac"
}
],
"navigate.nextDoc": [
{
"key": "Ctrl-Tab"
Expand Down
3 changes: 2 additions & 1 deletion src/brackets.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"contributors_url" : "https://api.github.com/repos/adobe/brackets/contributors",
"extension_wiki_url": "https://github.com/adobe/brackets/wiki/Brackets-Extensions",
"extension_registry": "https://s3.amazonaws.com/extend.brackets/registry.json",
"extension_url" : "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip"
"extension_url" : "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip",
"linting.enabled_by_default" : true
}
}
4 changes: 3 additions & 1 deletion src/brackets.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@ define(function (require, exports, module) {
ExtensionUtils = require("utils/ExtensionUtils"),
DragAndDrop = require("utils/DragAndDrop"),
ColorUtils = require("utils/ColorUtils"),
CodeInspection = require("language/CodeInspection"),
NativeApp = require("utils/NativeApp");

// Load modules that self-register and just need to get included in the main project
require("command/DefaultMenus");
require("document/ChangedDocumentTracker");
Expand Down Expand Up @@ -145,6 +146,7 @@ define(function (require, exports, module) {
CodeHintManager : CodeHintManager,
Dialogs : Dialogs,
DefaultDialogs : DefaultDialogs,
CodeInspection : CodeInspection,
CSSUtils : require("language/CSSUtils"),
LiveDevelopment : require("LiveDevelopment/LiveDevelopment"),
LiveDevServerManager : require("LiveDevelopment/LiveDevServerManager"),
Expand Down
2 changes: 2 additions & 0 deletions src/command/Commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ define(function (require, exports, module) {
exports.VIEW_RESTORE_FONT_SIZE = "view.restoreFontSize";
exports.VIEW_SCROLL_LINE_UP = "view.scrollLineUp";
exports.VIEW_SCROLL_LINE_DOWN = "view.scrollLineDown";
exports.VIEW_TOGGLE_INSPECTION = "view.toggleCodeInspection";
exports.TOGGLE_LINE_NUMBERS = "view.toggleLineNumbers";
exports.TOGGLE_ACTIVE_LINE = "view.toggleActiveLine";
exports.TOGGLE_WORD_WRAP = "view.toggleWordWrap";
Expand All @@ -105,6 +106,7 @@ define(function (require, exports, module) {
exports.NAVIGATE_JUMPTO_DEFINITION = "navigate.jumptoDefinition";
exports.NAVIGATE_GOTO_DEFINITION = "navigate.gotoDefinition";
exports.NAVIGATE_GOTO_LINE = "navigate.gotoLine";
exports.NAVIGATE_GOTO_FIRST_PROBLEM = "navigate.gotoFirstProblem";
exports.TOGGLE_QUICK_EDIT = "navigate.toggleQuickEdit";
exports.TOGGLE_QUICK_DOCS = "navigate.toggleQuickDocs";
exports.QUICK_EDIT_NEXT_MATCH = "navigate.nextMatch";
Expand Down
3 changes: 3 additions & 0 deletions src/command/DefaultMenus.js
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ define(function (require, exports, module) {
menu.addMenuItem(Commands.TOGGLE_WORD_WRAP);
menu.addMenuDivider();
menu.addMenuItem(Commands.FILE_LIVE_HIGHLIGHT);
menu.addMenuDivider();
menu.addMenuItem(Commands.VIEW_TOGGLE_INSPECTION);

/*
* Navigate menu
Expand All @@ -125,6 +127,7 @@ define(function (require, exports, module) {
menu.addMenuItem(Commands.NAVIGATE_GOTO_LINE);
menu.addMenuItem(Commands.NAVIGATE_GOTO_DEFINITION);
menu.addMenuItem(Commands.NAVIGATE_JUMPTO_DEFINITION);
menu.addMenuItem(Commands.NAVIGATE_GOTO_FIRST_PROBLEM);
menu.addMenuDivider();
menu.addMenuItem(Commands.NAVIGATE_NEXT_DOC);
menu.addMenuItem(Commands.NAVIGATE_PREV_DOC);
Expand Down
3 changes: 2 additions & 1 deletion src/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"contributors_url": "https://api.github.com/repos/adobe/brackets/contributors",
"extension_wiki_url": "https://github.com/adobe/brackets/wiki/Brackets-Extensions",
"extension_registry": "https://s3.amazonaws.com/extend.brackets/registry.json",
"extension_url": "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip"
"extension_url": "https://s3.amazonaws.com/extend.brackets/{0}/{0}-{1}.zip",
"linting.enabled_by_default" : true
},
"name": "Brackets",
"version": "0.31.0-0",
Expand Down
3 changes: 0 additions & 3 deletions src/extensions/default/JSLint/config.json

This file was deleted.

29 changes: 0 additions & 29 deletions src/extensions/default/JSLint/jslint.css

This file was deleted.

11 changes: 0 additions & 11 deletions src/extensions/default/JSLint/keyboard.json

This file was deleted.

Loading

0 comments on commit db4e426

Please sign in to comment.