Merge branch 'master' of https://github.com/golang/lint

Author: Dinesh Kumar

README.md

@@ -6,7 +6,7 @@ Golint is a linter for Go source code.
 
 Golint requires Go 1.6 or later.
 
-    go get -u github.com/golang/lint/golint
+    go get -u golang.org/x/lint/golint
 
 ## Usage
 
@@ -41,15 +41,18 @@ Golint makes suggestions for many of the mechanically checkable items listed in
 [Effective Go](https://golang.org/doc/effective_go.html) and the
 [CodeReviewComments wiki page](https://golang.org/wiki/CodeReviewComments).
 
-If you find an established style that is frequently violated, and which
-you think golint could statically check,
-[file an issue](https://github.com/golang/lint/issues).
+## Scope
+
+Golint is meant to carry out the stylistic conventions put forth in
+[Effective Go](https://golang.org/doc/effective_go.html) and
+[CodeReviewComments](https://golang.org/wiki/CodeReviewComments).
+Changes that are not aligned with those documents will not be considered.
 
 ## Contributions
 
-Contributions to this project are welcome, though please send mail before
-starting work on anything major. Contributors retain their copyright, so we
-need you to fill out
+Contributions to this project are welcome provided they are [in scope](#scope),
+though please send mail before starting work on anything major.
+Contributors retain their copyright, so we need you to fill out
 [a short form](https://developers.google.com/open-source/cla/individual)
 before we can accept your contribution.
 

golint/golint.go

@@ -16,7 +16,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/golang/lint"
+	"golang.org/x/lint"
 )
 
 var (

golint/import.go

@@ -22,13 +22,12 @@ import (
 	"strings"
 )
 
-var buildContext = build.Default
-
 const vendorDir = "vendor"
 
 var (
-	goroot    = filepath.Clean(runtime.GOROOT())
-	gorootSrc = filepath.Join(goroot, "src")
+	buildContext = build.Default
+	goroot       = filepath.Clean(runtime.GOROOT())
+	gorootSrc    = filepath.Join(goroot, "src")
 )
 
 // importPathsNoDotExpansion returns the import paths to use for the given

lint.go

@@ -527,7 +527,10 @@ func (f *file) lintExported() {
 	})
 }
 
-var allCapsRE = regexp.MustCompile(`^[A-Z0-9_]+$`)
+var (
+	allCapsRE = regexp.MustCompile(`^[A-Z0-9_]+$`)
+	anyCapsRE = regexp.MustCompile(`[A-Z]`)
+)
 
 // knownNameExceptions is a set of names that are known to be exempt from naming checks.
 // This is usually because they are constrained by having to match names in the
@@ -544,6 +547,9 @@ func (f *file) lintNames() {
 	if strings.Contains(f.f.Name.Name, "_") && !strings.HasSuffix(f.f.Name.Name, "_test") {
 		f.errorf(f.f, 1, link("http://golang.org/doc/effective_go.html#package-names"), category("naming"), "don't use an underscore in package name")
 	}
+	if anyCapsRE.MatchString(f.f.Name.Name) {
+		f.errorf(f.f, 1, link("http://golang.org/doc/effective_go.html#package-names"), category("mixed-caps"), "don't use MixedCaps in package name; %s should be %s", f.f.Name.Name, strings.ToLower(f.f.Name.Name))
+	}
 
 	check := func(id *ast.Ident, thing string) {
 		if id.Name == "_" {
@@ -1078,20 +1084,25 @@ func (f *file) lintRanges() {
 		if !ok {
 			return true
 		}
-		if rs.Value == nil {
-			// for x = range m { ... }
-			return true // single var form
-		}
-		if !isIdent(rs.Value, "_") {
-			// for ?, y = range m { ... }
+
+		if isIdent(rs.Key, "_") && (rs.Value == nil || isIdent(rs.Value, "_")) {
+			p := f.errorf(rs.Key, 1, category("range-loop"), "should omit values from range; this loop is equivalent to `for range ...`")
+
+			newRS := *rs // shallow copy
+			newRS.Value = nil
+			newRS.Key = nil
+			p.ReplacementLine = f.firstLineOf(&newRS, rs)
+
 			return true
 		}
 
-		p := f.errorf(rs.Value, 1, category("range-loop"), "should omit 2nd value from range; this loop is equivalent to `for %s %s range ...`", f.render(rs.Key), rs.Tok)
+		if isIdent(rs.Value, "_") {
+			p := f.errorf(rs.Value, 1, category("range-loop"), "should omit 2nd value from range; this loop is equivalent to `for %s %s range ...`", f.render(rs.Key), rs.Tok)
 
-		newRS := *rs // shallow copy
-		newRS.Value = nil
-		p.ReplacementLine = f.firstLineOf(&newRS, rs)
+			newRS := *rs // shallow copy
+			newRS.Value = nil
+			p.ReplacementLine = f.firstLineOf(&newRS, rs)
+		}
 
 		return true
 	})

misc/emacs/golint.el

@@ -1,9 +1,8 @@
 ;;; golint.el --- lint for the Go source code
 
 ;; Copyright 2013 The Go Authors. All rights reserved.
-;; Use of this source code is governed by a BSD-style
-;; license that can be found in the LICENSE file.
 
+;; License: BSD-3-clause
 ;; URL: https://github.com/golang/lint
 
 ;;; Commentary:
@@ -17,15 +16,16 @@
 ;; Usage:
 ;;   C-x `
 ;;     Jump directly to the line in your code which caused the first message.
-;; 
+;;
 ;;   For more usage, see Compilation-Mode:
 ;;     http://www.gnu.org/software/emacs/manual/html_node/emacs/Compilation-Mode.html
 
 ;;; Code:
+
 (require 'compile)
 
-(defun go-lint-buffer-name (mode) 
- "*Golint*") 
+(defun go-lint-buffer-name (mode)
+  "*Golint*")
 
 (defun golint-process-setup ()
   "Setup compilation variables and buffer for `golint'."
@@ -36,12 +36,13 @@
   (set (make-local-variable 'compilation-scroll-output) nil)
   (set (make-local-variable 'compilation-disable-input) t)
   (set (make-local-variable 'compilation-process-setup-function)
-       'golint-process-setup)
-)
+       'golint-process-setup))
 
 ;;;###autoload
 (defun golint ()
-  "Run golint on the current file and populate the fix list. Pressing C-x ` will jump directly to the line in your code which caused the first message."
+  "Run golint on the current file and populate the fix list.
+Pressing \"C-x `\" jumps directly to the line in your code which
+caused the first message."
   (interactive)
   (compilation-start
    (mapconcat #'shell-quote-argument

testdata/pkg-caps.go

@@ -0,0 +1,4 @@
+// MixedCaps package name
+
+// Package PkgName ...
+package PkgName // MATCH /don't use MixedCaps in package name/

testdata/range.go

@@ -16,6 +16,12 @@ func f() {
 	for y, _ = range m { // MATCH /should omit 2nd value.*range.*equivalent.*for y = range/
 	}
 
+	for _ = range m { // MATCH /should omit values.*range.*equivalent.*for range/
+	}
+
+	for _, _ = range m { // MATCH /should omit values.*range.*equivalent.*for range/
+	}
+
 	// all OK:
 	for x := range m {
 		_ = x