From aab6cde9265b060907189030d18b1bf61f6316eb Mon Sep 17 00:00:00 2001
From: Laszlo Kishalmi <laszlo.kishalmi@partech.com>
Date: Fri, 13 Mar 2026 13:37:22 -0700
Subject: [PATCH] Enable Plain Text Spellchecker for Markdown

---
 ide/markdown/manifest.mf                      |  1 +
 .../modules/markdown/MarkdownDataObject.java  |  6 +--
 .../markdown/MarkdownViewerElement.java       |  2 +-
 .../org/netbeans/modules/markdown/layer.xml   | 40 +++++++++++++++++++
 4 files changed, 45 insertions(+), 4 deletions(-)
 create mode 100644 ide/markdown/src/org/netbeans/modules/markdown/layer.xml

diff --git a/ide/markdown/manifest.mf b/ide/markdown/manifest.mf
index fe00e45399b8..3dba7c3623d4 100644
--- a/ide/markdown/manifest.mf
+++ b/ide/markdown/manifest.mf
@@ -1,6 +1,7 @@
 Manifest-Version: 1.0
 AutoUpdate-Show-In-Client: true
 OpenIDE-Module: org.netbeans.modules.markdown
+OpenIDE-Module-Layer: org/netbeans/modules/markdown/layer.xml
 OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/markdown/Bundle.properties
 OpenIDE-Module-Specification-Version: 1.20
 
diff --git a/ide/markdown/src/org/netbeans/modules/markdown/MarkdownDataObject.java b/ide/markdown/src/org/netbeans/modules/markdown/MarkdownDataObject.java
index 8629433abec4..cd36ba5a4399 100644
--- a/ide/markdown/src/org/netbeans/modules/markdown/MarkdownDataObject.java
+++ b/ide/markdown/src/org/netbeans/modules/markdown/MarkdownDataObject.java
@@ -105,11 +105,11 @@
 @GrammarRegistration(mimeType=MarkdownDataObject.MIME_TYPE, grammar="markdown.tmLanguage.json")
 public class MarkdownDataObject extends MultiDataObject {
 
-    public static final String MIME_TYPE = "text/x-markdown-nb";
+    public static final String MIME_TYPE = "text/x-markdown";
 
     public MarkdownDataObject(FileObject pf, MultiFileLoader loader) throws DataObjectExistsException, IOException {
         super(pf, loader);
-        registerEditor("text/x-markdown", true);
+        registerEditor(MIME_TYPE, true);
     }
 
     @Override
@@ -120,7 +120,7 @@ protected int associateLookup() {
     @MultiViewElement.Registration(
             displayName = "#LBL_Markdown_EDITOR",
             iconBase = "org/netbeans/modules/markdown/markdown.png",
-            mimeType = "text/x-markdown",
+            mimeType = MarkdownDataObject.MIME_TYPE,
             persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED,
             preferredID = "Markdown",
             position = 1000
diff --git a/ide/markdown/src/org/netbeans/modules/markdown/MarkdownViewerElement.java b/ide/markdown/src/org/netbeans/modules/markdown/MarkdownViewerElement.java
index db65b2a5d9e9..fd61232a2958 100644
--- a/ide/markdown/src/org/netbeans/modules/markdown/MarkdownViewerElement.java
+++ b/ide/markdown/src/org/netbeans/modules/markdown/MarkdownViewerElement.java
@@ -71,7 +71,7 @@
 @MultiViewElement.Registration(
         displayName = "#LBL_MarkdownViewer",
         iconBase = "org/netbeans/modules/markdown/markdown.png",
-        mimeType = "text/x-markdown",
+        mimeType = MarkdownDataObject.MIME_TYPE,
         persistenceType = TopComponent.PERSISTENCE_NEVER,
         preferredID = "MarkdownViewer",
         position = 2000
diff --git a/ide/markdown/src/org/netbeans/modules/markdown/layer.xml b/ide/markdown/src/org/netbeans/modules/markdown/layer.xml
new file mode 100644
index 000000000000..53b741ded34d
--- /dev/null
+++ b/ide/markdown/src/org/netbeans/modules/markdown/layer.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<!DOCTYPE filesystem PUBLIC "-//NetBeans//DTD Filesystem 1.1//EN" "http://www.netbeans.org/dtds/filesystem-1_1.dtd">
+<filesystem>
+    <folder name="Editors">
+        <folder name="text">
+            <folder name="x-markdown">
+                <folder name="TokenListProvider">
+                    <file name="org-netbeans-modules-spellchecker-plain-PlainTokenListProvider.instance" />
+                </folder>
+                <folder name="CompletionProviders">
+                    <file name="org-netbeans-modules-spellchecker-completion-WordCompletion.instance">
+                        <attr name="position" intvalue="600"/>
+                    </file>
+                </folder>
+            </folder>
+        </folder>
+    </folder>
+</filesystem>
+
+