buffer: Prefer user defined over built-in file types

zyedidia · Sep 8, 2023 · cf90602 · cf90602
1 parent 18dbed8
commit cf90602
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/internal/buffer/buffer.go b/internal/buffer/buffer.go
@@ -733,27 +733,29 @@ func (b *Buffer) UpdateRules() {
 		}
 	}
 
-	// search in the default syntax files
-	for _, f := range config.ListRuntimeFiles(config.RTSyntaxHeader) {
-		data, err := f.Data()
-		if err != nil {
-			screen.TermMessage("Error loading syntax header file " + f.Name() + ": " + err.Error())
-			continue
-		}
+	if !foundDef {
+		// search in the default syntax files
+		for _, f := range config.ListRuntimeFiles(config.RTSyntaxHeader) {
+			data, err := f.Data()
+			if err != nil {
+				screen.TermMessage("Error loading syntax header file " + f.Name() + ": " + err.Error())
+				continue
+			}
 
-		header, err = highlight.MakeHeader(data)
-		if err != nil {
-			screen.TermMessage("Error reading syntax header file", f.Name(), err)
-			continue
-		}
+			header, err = highlight.MakeHeader(data)
+			if err != nil {
+				screen.TermMessage("Error reading syntax header file", f.Name(), err)
+				continue
+			}
 
-		if ft == "unknown" || ft == "" {
-			if highlight.MatchFileName(header, b.Path) {
-				syntaxFiles = append(syntaxFiles, SyntaxFileBuffer{header, f.Name(), nil})
+			if ft == "unknown" || ft == "" {
+				if highlight.MatchFileName(header, b.Path) {
+					syntaxFiles = append(syntaxFiles, SyntaxFileBuffer{header, f.Name(), nil})
+				}
+			} else if header.FileType == ft {
+				syntaxFile = f.Name()
+				break
 			}
-		} else if header.FileType == ft {
-			syntaxFile = f.Name()
-			break
 		}
 	}