diff --git a/native/v8_extensions/native.mm b/native/v8_extensions/native.mm index 1fae00829..73b87bb06 100644 --- a/native/v8_extensions/native.mm +++ b/native/v8_extensions/native.mm @@ -117,7 +117,7 @@ bool Native::Execute(const CefString& name, if (entry->fts_level == 0) { continue; } - + bool isFile = entry->fts_info == FTS_NSOK; bool isDir = entry->fts_info == FTS_D; if (!isFile && !isDir) { diff --git a/native/v8_extensions/onig_scanner.mm b/native/v8_extensions/onig_scanner.mm index 7ce69c44b..c2d7346cf 100644 --- a/native/v8_extensions/onig_scanner.mm +++ b/native/v8_extensions/onig_scanner.mm @@ -56,7 +56,7 @@ class OnigScannerUserData : public CefBase { bool useCachedResult = false; OnigResult *result = NULL; - + // In Oniguruma, \G is based on the start position of the match, so the result // changes based on the start position. So it can't be cached. BOOL containsBackslashG = [regExp.expression rangeOfString:@"\\G"].location != NSNotFound; diff --git a/src/extensions/outline-view/index.coffee b/src/extensions/outline-view/index.coffee index 1a19f8519..049aa16ea 100644 --- a/src/extensions/outline-view/index.coffee +++ b/src/extensions/outline-view/index.coffee @@ -1 +1 @@ -module.exports = require 'outline-view/outline-view' +module.exports = require 'outline-view/src/outline-view' diff --git a/spec/extensions/outline-view-spec.coffee b/src/extensions/outline-view/spec/outline-view-spec.coffee similarity index 98% rename from spec/extensions/outline-view-spec.coffee rename to src/extensions/outline-view/spec/outline-view-spec.coffee index 85f477ad0..688dabf68 100644 --- a/spec/extensions/outline-view-spec.coffee +++ b/src/extensions/outline-view/spec/outline-view-spec.coffee @@ -1,6 +1,6 @@ RootView = require 'root-view' OutlineView = require 'outline-view' -TagGenerator = require 'outline-view/tag-generator' +TagGenerator = require 'outline-view/src/tag-generator' describe "OutlineView", -> [rootView, outlineView] = [] diff --git a/src/extensions/outline-view/keymap.coffee b/src/extensions/outline-view/src/keymap.coffee similarity index 100% rename from src/extensions/outline-view/keymap.coffee rename to src/extensions/outline-view/src/keymap.coffee diff --git a/src/extensions/outline-view/outline-view.coffee b/src/extensions/outline-view/src/outline-view.coffee similarity index 91% rename from src/extensions/outline-view/outline-view.coffee rename to src/extensions/outline-view/src/outline-view.coffee index 57a94e6b4..fdc9ab930 100644 --- a/src/extensions/outline-view/outline-view.coffee +++ b/src/extensions/outline-view/src/outline-view.coffee @@ -1,14 +1,14 @@ {View, $$} = require 'space-pen' SelectList = require 'select-list' Editor = require 'editor' -TagGenerator = require 'outline-view/tag-generator' +TagGenerator = require 'outline-view/src/tag-generator' module.exports = class OutlineView extends SelectList @activate: (rootView) -> requireStylesheet 'select-list.css' - requireStylesheet 'outline-view/outline-view.css' + requireStylesheet 'outline-view/src/outline-view.css' @instance = new OutlineView(rootView) rootView.command 'outline-view:toggle', => @instance.toggle() diff --git a/src/extensions/outline-view/outline-view.css b/src/extensions/outline-view/src/outline-view.css similarity index 100% rename from src/extensions/outline-view/outline-view.css rename to src/extensions/outline-view/src/outline-view.css diff --git a/src/extensions/outline-view/tag-generator.coffee b/src/extensions/outline-view/src/tag-generator.coffee similarity index 93% rename from src/extensions/outline-view/tag-generator.coffee rename to src/extensions/outline-view/src/tag-generator.coffee index c0079fbde..61fc180c3 100644 --- a/src/extensions/outline-view/tag-generator.coffee +++ b/src/extensions/outline-view/src/tag-generator.coffee @@ -43,5 +43,5 @@ class TagGenerator for line in lines tag = @parseTagLine(line) @callback(tag) if tag - command = "ctags --fields=+KS -nf - #{@path}" + command = "#{require.resolve('ctags')} --fields=+KS -nf - #{@path}" ChildProcess.exec(command, options) diff --git a/vendor/ctags b/vendor/ctags new file mode 100755 index 000000000..5c8c5ad45 Binary files /dev/null and b/vendor/ctags differ