Merge pull request #140 from dtulig/master
Addresses an issue where marginalia fails to parse a project.clj where the first form in the file isn't "defproject".
This commit is contained in:
commit
715e4f14f0
3 changed files with 23 additions and 3 deletions
|
@ -122,9 +122,13 @@
|
|||
([path]
|
||||
(try
|
||||
(let [rdr (clojure.lang.LineNumberingPushbackReader.
|
||||
(java.io.FileReader.
|
||||
(java.io.File. path)))]
|
||||
(parse-project-form (read rdr)))
|
||||
(java.io.FileReader.
|
||||
(java.io.File. path)))]
|
||||
(loop [line (read rdr)]
|
||||
(let [found-project? (= 'defproject (first line))]
|
||||
(if found-project?
|
||||
(parse-project-form line)
|
||||
(recur (read rdr))))))
|
||||
(catch Exception e
|
||||
(throw (Exception.
|
||||
(str
|
||||
|
|
6
test/marginalia/test/core.clj
Normal file
6
test/marginalia/test/core.clj
Normal file
|
@ -0,0 +1,6 @@
|
|||
(ns marginalia.test.core
|
||||
(:require marginalia.core)
|
||||
(:use clojure.test))
|
||||
|
||||
(deftest parse-project-file-simple
|
||||
(is (= "project-name" (:name (marginalia.core/parse-project-file "test/marginalia/test/multi-def-project.clj.txt")))))
|
10
test/marginalia/test/multi-def-project.clj.txt
Normal file
10
test/marginalia/test/multi-def-project.clj.txt
Normal file
|
@ -0,0 +1,10 @@
|
|||
(defn some-other-form
|
||||
[]
|
||||
(= 1 1))
|
||||
|
||||
(defproject project-name "0.1.0-SNAPSHOT"
|
||||
:description "FIXME: write description"
|
||||
:url "http://example.com/FIXME"
|
||||
:license {:name "Eclipse Public License"
|
||||
:url "http://www.eclipse.org/legal/epl-v10.html"}
|
||||
:dependencies [[org.clojure/clojure "1.6.0"]])
|
Loading…
Reference in a new issue